Skip to content

Commit 6c1898a

Browse files
kannanjgithubkannanjgithub
committed
Save changes.
1 parent 4cf653d commit 6c1898a

File tree

4 files changed

+37
-33
lines changed

4 files changed

+37
-33
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(), false);
566+
.build());
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, false);
77+
/* staticCertValidationContext= */ null);
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, false);
108+
/* staticCertValidationContext= */ null);
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, false);
138+
/* staticCertValidationContext= */ null);
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, false);
172+
staticCertValidationContext);
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, false);
202+
/* staticCertValidationContext= */ null);
203203

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

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

Lines changed: 8 additions & 17 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, false);
168+
null);
169169
}
170170

171171
/** Gets a cert from contents of a resource. */
@@ -182,8 +182,7 @@ private static CommonTlsContext buildCommonTlsContextForCertProviderInstance(
182182
String rootInstanceName,
183183
String rootCertName,
184184
Iterable<String> alpnProtocols,
185-
CertificateValidationContext staticCertValidationContext,
186-
boolean useSystemRootCerts) {
185+
CertificateValidationContext staticCertValidationContext) {
187186
CommonTlsContext.Builder builder = CommonTlsContext.newBuilder();
188187
if (certInstanceName != null) {
189188
builder =
@@ -194,8 +193,7 @@ private static CommonTlsContext buildCommonTlsContextForCertProviderInstance(
194193
}
195194
builder =
196195
addCertificateValidationContext(
197-
builder, rootInstanceName, rootCertName, staticCertValidationContext,
198-
useSystemRootCerts);
196+
builder, rootInstanceName, rootCertName, staticCertValidationContext);
199197
if (alpnProtocols != null) {
200198
builder.addAllAlpnProtocols(alpnProtocols);
201199
}
@@ -230,8 +228,7 @@ private static CommonTlsContext.Builder addCertificateValidationContext(
230228
CommonTlsContext.Builder builder,
231229
String rootInstanceName,
232230
String rootCertName,
233-
CertificateValidationContext staticCertValidationContext,
234-
boolean useSystemRootCerts) {
231+
CertificateValidationContext staticCertValidationContext) {
235232
CertificateValidationContext.Builder contextBuilder;
236233
if (staticCertValidationContext == null) {
237234
contextBuilder = CertificateValidationContext.newBuilder();
@@ -243,10 +240,6 @@ private static CommonTlsContext.Builder addCertificateValidationContext(
243240
.setInstanceName(rootInstanceName)
244241
.setCertificateName(rootCertName));
245242
builder.setValidationContext(contextBuilder.build());
246-
} else if (useSystemRootCerts) {
247-
builder.setValidationContext(contextBuilder.setSystemRootCerts(
248-
CertificateValidationContext.SystemRootCerts.getDefaultInstance())
249-
.build());
250243
}
251244
return builder.setCombinedValidationContext(CombinedCertificateValidationContext.newBuilder()
252245
.setDefaultValidationContext(contextBuilder));
@@ -280,17 +273,15 @@ private static CommonTlsContext.Builder addNewCertificateValidationContext(
280273
@Nullable String rootInstanceName,
281274
@Nullable String rootCertName,
282275
Iterable<String> alpnProtocols,
283-
CertificateValidationContext staticCertValidationContext,
284-
boolean useSystemRootCerts) {
276+
CertificateValidationContext staticCertValidationContext) {
285277
return buildUpstreamTlsContext(
286278
buildCommonTlsContextForCertProviderInstance(
287279
certInstanceName,
288280
certName,
289281
rootInstanceName,
290282
rootCertName,
291283
alpnProtocols,
292-
staticCertValidationContext,
293-
useSystemRootCerts));
284+
staticCertValidationContext));
294285
}
295286

296287
/** Helper method to build UpstreamTlsContext for CertProvider tests. */
@@ -329,8 +320,8 @@ private static CommonTlsContext.Builder addNewCertificateValidationContext(
329320
rootInstanceName,
330321
rootCertName,
331322
alpnProtocols,
332-
staticCertValidationContext,
333-
false), requireClientCert);
323+
staticCertValidationContext),
324+
requireClientCert);
334325
}
335326

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

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

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,26 @@ private CertProviderClientSslContextProvider getSslContextProvider(
7474
Iterable<String> alpnProtocols,
7575
CertificateValidationContext staticCertValidationContext,
7676
boolean useSystemRootCerts) {
77-
EnvoyServerProtoData.UpstreamTlsContext upstreamTlsContext =
78-
CommonTlsContextTestsUtil.buildUpstreamTlsContextForCertProviderInstance(
79-
certInstanceName,
80-
"cert-default",
81-
rootInstanceName,
82-
"root-default",
83-
alpnProtocols,
84-
staticCertValidationContext,
85-
useSystemRootCerts);
77+
EnvoyServerProtoData.UpstreamTlsContext upstreamTlsContext;
78+
if (useSystemRootCerts) {
79+
upstreamTlsContext =
80+
CommonTlsContextTestsUtil.buildNewUpstreamTlsContextForCertProviderInstance(
81+
certInstanceName,
82+
"cert-default",
83+
rootInstanceName,
84+
"root-default",
85+
alpnProtocols,
86+
staticCertValidationContext);
87+
} else {
88+
upstreamTlsContext =
89+
CommonTlsContextTestsUtil.buildUpstreamTlsContextForCertProviderInstance(
90+
certInstanceName,
91+
"cert-default",
92+
rootInstanceName,
93+
"root-default",
94+
alpnProtocols,
95+
staticCertValidationContext);
96+
}
8697
return (CertProviderClientSslContextProvider)
8798
certProviderClientSslContextProviderFactory.getProvider(
8899
upstreamTlsContext,
@@ -187,7 +198,9 @@ public void testProviderForClient_systemRootCerts() throws Exception {
187198
null,
188199
CommonBootstrapperTestUtils.getTestBootstrapInfo(),
189200
/* alpnProtocols= */ null,
190-
/* staticCertValidationContext= */ null,
201+
CertificateValidationContext.newBuilder()
202+
.setSystemRootCerts(CertificateValidationContext.SystemRootCerts.getDefaultInstance())
203+
.build(),
191204
true);
192205

193206
assertThat(provider.savedKey).isNull();

0 commit comments

Comments
 (0)