Skip to content

okhttp: avoid sharing KeyManager/TrustManager across threads in mTLS test #13062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
AgraVator wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −7
Draft

okhttp: avoid sharing KeyManager/TrustManager across threads in mTLS test #13062

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions okhttp/src/test/java/io/grpc/okhttp/OkHttpChannelBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,19 +201,19 @@ public void sslSocketFactoryFrom_tls_customRoots() throws Exception {

@Test
public void sslSocketFactoryFrom_tls_mtls() throws Exception {
KeyManager[] keyManagers;
KeyManager[] serverKeyManagers;
try (InputStream server1Chain = TlsTesting.loadCert("server1.pem");
InputStream server1Key = TlsTesting.loadCert("server1.key")) {
keyManagers = OkHttpChannelBuilder.createKeyManager(server1Chain, server1Key);
serverKeyManagers = OkHttpChannelBuilder.createKeyManager(server1Chain, server1Key);
}

TrustManager[] trustManagers;
TrustManager[] serverTrustManagers;
try (InputStream ca = TlsTesting.loadCert("ca.pem")) {
trustManagers = CertificateUtils.createTrustManager(ca);
serverTrustManagers = CertificateUtils.createTrustManager(ca);
}

SSLContext serverContext = SSLContext.getInstance("TLS");
serverContext.init(keyManagers, trustManagers, null);
serverContext.init(serverKeyManagers, serverTrustManagers, null);
final SSLServerSocket serverListenSocket =
(SSLServerSocket) serverContext.getServerSocketFactory().createServerSocket(0);
serverListenSocket.setNeedClientAuth(true);
Expand All @@ -231,9 +231,20 @@ public void sslSocketFactoryFrom_tls_mtls() throws Exception {
}
}).start();

KeyManager[] clientKeyManagers;
try (InputStream server1Chain = TlsTesting.loadCert("server1.pem");
InputStream server1Key = TlsTesting.loadCert("server1.key")) {
clientKeyManagers = OkHttpChannelBuilder.createKeyManager(server1Chain, server1Key);
}

TrustManager[] clientTrustManagers;
try (InputStream ca = TlsTesting.loadCert("ca.pem")) {
clientTrustManagers = CertificateUtils.createTrustManager(ca);
}

ChannelCredentials creds = TlsChannelCredentials.newBuilder()
.keyManager(keyManagers)
.trustManager(trustManagers)
.keyManager(clientKeyManagers)
.trustManager(clientTrustManagers)
.build();
OkHttpChannelBuilder.SslSocketFactoryResult result =
OkHttpChannelBuilder.sslSocketFactoryFrom(creds);
Expand Down
Loading