Skip to content

Commit 968d564

Browse files
kannanjgithubkannanjgithub
committed
Save changes.
1 parent 4076998 commit 968d564

File tree

4 files changed

+36
-27
lines changed

4 files changed

+36
-27
lines changed

‎xds/src/test/java/io/grpc/xds/XdsSecurityClientServerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ private UpstreamTlsContext setBootstrapInfoAndBuildUpstreamTlsContextForUsingSys
563563
CertificateValidationContext.newBuilder()
564564
.setSystemRootCerts(
565565
CertificateValidationContext.SystemRootCerts.newBuilder().build())
566-
.build());
566+
.build(), false);
567567
}
568568
return CommonTlsContextTestsUtil.buildNewUpstreamTlsContextForCertProviderInstance(
569569
"google_cloud_private_spiffe-client", "ROOT", null,

‎xds/src/test/java/io/grpc/xds/internal/security/ClientSslContextProviderFactoryTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void createCertProviderClientSslContextProvider() throws XdsInitializatio
7474
"gcp_id",
7575
"root-default",
7676
/* alpnProtocols= */ null,
77-
/* staticCertValidationContext= */ null);
77+
/* staticCertValidationContext= */ null, false);
7878

7979
Bootstrapper.BootstrapInfo bootstrapInfo = CommonBootstrapperTestUtils.getTestBootstrapInfo();
8080
clientSslContextProviderFactory =
@@ -105,7 +105,7 @@ public void bothPresent_expectCertProviderClientSslContextProvider()
105105
"gcp_id",
106106
"root-default",
107107
/* alpnProtocols= */ null,
108-
/* staticCertValidationContext= */ null);
108+
/* staticCertValidationContext= */ null, false);
109109

110110
CommonTlsContext.Builder builder = upstreamTlsContext.getCommonTlsContext().toBuilder();
111111
builder = addFilenames(builder, "foo.pem", "foo.key", "root.pem");
@@ -135,7 +135,7 @@ public void createCertProviderClientSslContextProvider_onlyRootCert()
135135
"gcp_id",
136136
"root-default",
137137
/* alpnProtocols= */ null,
138-
/* staticCertValidationContext= */ null);
138+
/* staticCertValidationContext= */ null, false);
139139

140140
Bootstrapper.BootstrapInfo bootstrapInfo = CommonBootstrapperTestUtils.getTestBootstrapInfo();
141141
clientSslContextProviderFactory =
@@ -169,7 +169,7 @@ public void createCertProviderClientSslContextProvider_withStaticContext()
169169
"gcp_id",
170170
"root-default",
171171
/* alpnProtocols= */ null,
172-
staticCertValidationContext);
172+
staticCertValidationContext, false);
173173

174174
Bootstrapper.BootstrapInfo bootstrapInfo = CommonBootstrapperTestUtils.getTestBootstrapInfo();
175175
clientSslContextProviderFactory =
@@ -199,7 +199,7 @@ public void createCertProviderClientSslContextProvider_2providers()
199199
"file_provider",
200200
"root-default",
201201
/* alpnProtocols= */ null,
202-
/* staticCertValidationContext= */ null);
202+
/* staticCertValidationContext= */ null, false);
203203

204204
Bootstrapper.BootstrapInfo bootstrapInfo = CommonBootstrapperTestUtils.getTestBootstrapInfo();
205205
clientSslContextProviderFactory =

‎xds/src/test/java/io/grpc/xds/internal/security/CommonTlsContextTestsUtil.java‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public static EnvoyServerProtoData.UpstreamTlsContext buildUpstreamTlsContext(
165165
commonInstanceName,
166166
"ROOT",
167167
null,
168-
null);
168+
null, false);
169169
}
170170

171171
/** Gets a cert from contents of a resource. */
@@ -182,7 +182,8 @@ private static CommonTlsContext buildCommonTlsContextForCertProviderInstance(
182182
String rootInstanceName,
183183
String rootCertName,
184184
Iterable<String> alpnProtocols,
185-
CertificateValidationContext staticCertValidationContext) {
185+
CertificateValidationContext staticCertValidationContext,
186+
boolean useSystemRootCerts) {
186187
CommonTlsContext.Builder builder = CommonTlsContext.newBuilder();
187188
if (certInstanceName != null) {
188189
builder =
@@ -193,7 +194,8 @@ private static CommonTlsContext buildCommonTlsContextForCertProviderInstance(
193194
}
194195
builder =
195196
addCertificateValidationContext(
196-
builder, rootInstanceName, rootCertName, staticCertValidationContext);
197+
builder, rootInstanceName, rootCertName, staticCertValidationContext,
198+
useSystemRootCerts);
197199
if (alpnProtocols != null) {
198200
builder.addAllAlpnProtocols(alpnProtocols);
199201
}
@@ -228,7 +230,8 @@ private static CommonTlsContext.Builder addCertificateValidationContext(
228230
CommonTlsContext.Builder builder,
229231
String rootInstanceName,
230232
String rootCertName,
231-
CertificateValidationContext staticCertValidationContext) {
233+
CertificateValidationContext staticCertValidationContext,
234+
boolean useSystemRootCerts) {
232235
CertificateValidationContext.Builder contextBuilder;
233236
if (staticCertValidationContext == null) {
234237
contextBuilder = CertificateValidationContext.newBuilder();
@@ -240,7 +243,7 @@ private static CommonTlsContext.Builder addCertificateValidationContext(
240243
.setInstanceName(rootInstanceName)
241244
.setCertificateName(rootCertName));
242245
builder.setValidationContext(contextBuilder.build());
243-
} else {
246+
} else if (useSystemRootCerts) {
244247
builder.setValidationContext(contextBuilder.setSystemRootCerts(
245248
CertificateValidationContext.SystemRootCerts.getDefaultInstance())
246249
.build());
@@ -277,15 +280,17 @@ private static CommonTlsContext.Builder addNewCertificateValidationContext(
277280
@Nullable String rootInstanceName,
278281
@Nullable String rootCertName,
279282
Iterable<String> alpnProtocols,
280-
CertificateValidationContext staticCertValidationContext) {
283+
CertificateValidationContext staticCertValidationContext,
284+
boolean useSystemRootCerts) {
281285
return buildUpstreamTlsContext(
282286
buildCommonTlsContextForCertProviderInstance(
283287
certInstanceName,
284288
certName,
285289
rootInstanceName,
286290
rootCertName,
287291
alpnProtocols,
288-
staticCertValidationContext));
292+
staticCertValidationContext,
293+
useSystemRootCerts));
289294
}
290295

291296
/** Helper method to build UpstreamTlsContext for CertProvider tests. */
@@ -324,7 +329,8 @@ private static CommonTlsContext.Builder addNewCertificateValidationContext(
324329
rootInstanceName,
325330
rootCertName,
326331
alpnProtocols,
327-
staticCertValidationContext), requireClientCert);
332+
staticCertValidationContext,
333+
false), requireClientCert);
328334
}
329335

330336
/** Helper method to build DownstreamTlsContext for CertProvider tests. */

‎xds/src/test/java/io/grpc/xds/internal/security/certprovider/CertProviderClientSslContextProviderTest.java‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,21 @@ public void setUp() throws Exception {
6868

6969
/** Helper method to build CertProviderClientSslContextProvider. */
7070
private CertProviderClientSslContextProvider getSslContextProvider(
71-
String certInstanceName,
72-
String rootInstanceName,
73-
Bootstrapper.BootstrapInfo bootstrapInfo,
74-
Iterable<String> alpnProtocols,
75-
CertificateValidationContext staticCertValidationContext) {
71+
String certInstanceName,
72+
String rootInstanceName,
73+
Bootstrapper.BootstrapInfo bootstrapInfo,
74+
Iterable<String> alpnProtocols,
75+
CertificateValidationContext staticCertValidationContext,
76+
boolean useSystemRootCerts) {
7677
EnvoyServerProtoData.UpstreamTlsContext upstreamTlsContext =
7778
CommonTlsContextTestsUtil.buildUpstreamTlsContextForCertProviderInstance(
7879
certInstanceName,
7980
"cert-default",
8081
rootInstanceName,
8182
"root-default",
8283
alpnProtocols,
83-
staticCertValidationContext);
84+
staticCertValidationContext,
85+
useSystemRootCerts);
8486
return (CertProviderClientSslContextProvider)
8587
certProviderClientSslContextProviderFactory.getProvider(
8688
upstreamTlsContext,
@@ -122,7 +124,7 @@ public void testProviderForClient_mtls() throws Exception {
122124
"gcp_id",
123125
CommonBootstrapperTestUtils.getTestBootstrapInfo(),
124126
/* alpnProtocols= */ null,
125-
/* staticCertValidationContext= */ null);
127+
/* staticCertValidationContext= */ null, false);
126128

127129
assertThat(provider.savedKey).isNull();
128130
assertThat(provider.savedCertChain).isNull();
@@ -185,7 +187,8 @@ public void testProviderForClient_systemRootCerts() throws Exception {
185187
null,
186188
CommonBootstrapperTestUtils.getTestBootstrapInfo(),
187189
/* alpnProtocols= */ null,
188-
/* staticCertValidationContext= */ null);
190+
/* staticCertValidationContext= */ null,
191+
true);
189192

190193
assertThat(provider.savedKey).isNull();
191194
assertThat(provider.savedCertChain).isNull();
@@ -305,7 +308,7 @@ public void testProviderForClient_queueExecutor() throws Exception {
305308
"gcp_id",
306309
CommonBootstrapperTestUtils.getTestBootstrapInfo(),
307310
/* alpnProtocols= */ null,
308-
/* staticCertValidationContext= */ null);
311+
/* staticCertValidationContext= */ null, false);
309312
QueuedExecutor queuedExecutor = new QueuedExecutor();
310313

311314
TestCallback testCallback =
@@ -338,7 +341,7 @@ public void testProviderForClient_tls() throws Exception {
338341
"gcp_id",
339342
CommonBootstrapperTestUtils.getTestBootstrapInfo(),
340343
/* alpnProtocols= */ null,
341-
/* staticCertValidationContext= */ null);
344+
/* staticCertValidationContext= */ null, false);
342345

343346
assertThat(provider.savedKey).isNull();
344347
assertThat(provider.savedCertChain).isNull();
@@ -375,7 +378,7 @@ public void testProviderForClient_sslContextException_onError() throws Exception
375378
"gcp_id",
376379
CommonBootstrapperTestUtils.getTestBootstrapInfo(),
377380
/* alpnProtocols= */null,
378-
staticCertValidationContext);
381+
staticCertValidationContext, false);
379382

380383
TestCallback testCallback = new TestCallback(MoreExecutors.directExecutor());
381384
provider.addCallback(testCallback);
@@ -407,7 +410,7 @@ public void testProviderForClient_rootInstanceNull_and_notUsingSystemRootCerts_e
407410
/* rootInstanceName= */ null,
408411
CommonBootstrapperTestUtils.getTestBootstrapInfo(),
409412
/* alpnProtocols= */ null,
410-
/* staticCertValidationContext= */ null);
413+
/* staticCertValidationContext= */ null, false);
411414
fail("exception expected");
412415
} catch (UnsupportedOperationException expected) {
413416
assertThat(expected).hasMessageThat().contains("Unsupported configurations in "
@@ -430,7 +433,7 @@ public void testProviderForClient_rootInstanceNull_but_isUsingSystemRootCerts_va
430433
CertificateValidationContext.newBuilder()
431434
.setSystemRootCerts(
432435
CertificateValidationContext.SystemRootCerts.newBuilder().build())
433-
.build());
436+
.build(), false);
434437
}
435438

436439
static class QueuedExecutor implements Executor {

0 commit comments

Comments
 (0)