flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

okhttp: Use normal server cert when testing trust checking 

Previously, untrustedServer_fails could have been failing for the same
reason as unmatchedServerSubjectAlternativeNames_fails. The
implementation could have been broken and not checking the cert chain
but still checking the hostname. We'd either need to override the
authority to match the badserver cert or use the normal server
certificates. It is best to use the normal server certificates as
mtls_succeeds confirms the configuration is correct and so our test is
failing for the right reason.
This commit is contained in:
Eric Anderson 2023-01-09 08:09:16 -08:00
parent c0de130ac6
commit a40e4343f5
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
okhttp/src/test/java/io/grpc/okhttp/TlsTest.java
View File

@ -173,8 +173,8 @@ public class TlsTest {
@Test
public void untrustedServer_fails() throws Exception {
ServerCredentials serverCreds;
try (InputStream serverCert = TlsTesting.loadCert("badserver.pem");
InputStream serverPrivateKey = TlsTesting.loadCert("badserver.key");
try (InputStream serverCert = TlsTesting.loadCert("server1.pem");
InputStream serverPrivateKey = TlsTesting.loadCert("server1.key");
InputStream caCert = TlsTesting.loadCert("ca.pem")) {
serverCreds = TlsServerCredentials.newBuilder()
.keyManager(serverCert, serverPrivateKey)
@ -183,11 +183,9 @@ public class TlsTest {
}
ChannelCredentials channelCreds;
try (InputStream clientCertChain = TlsTesting.loadCert("client.pem");
InputStream clientPrivateKey = TlsTesting.loadCert("client.key");
InputStream caCert = TlsTesting.loadCert("ca.pem")) {
InputStream clientPrivateKey = TlsTesting.loadCert("client.key")) {
channelCreds = TlsChannelCredentials.newBuilder()
.keyManager(clientCertChain, clientPrivateKey)
.trustManager(caCert)
.build();
}
Server server = grpcCleanupRule.register(server(serverCreds));