Skip to content

Support ConnectionSpec on Okhttp client and support null ConnectionSpec parameters #12677

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
megla-tlanghorst wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Support ConnectionSpec on Okhttp client and support null ConnectionSpec parameters #12677

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a79442
Allow proper customization of all SSL parameters
megla-tlanghorst Mar 5, 2026
d2729db
Make ConnectionSpec support null tlsVersions
megla-tlanghorst Mar 5, 2026
5fb58fe
Only check ALPN if TLS extensions are enabled
megla-tlanghorst Mar 6, 2026
37cb29c
Revert "Only check ALPN if TLS extensions are enabled"
megla-tlanghorst Mar 6, 2026
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
Prev Previous commit
Revert "Only check ALPN if TLS extensions are enabled" 
This reverts commit 5fb58fe.
  • Loading branch information
@megla-tlanghorst
megla-tlanghorst committed Mar 6, 2026
commit 37cb29c120f6fd8eeb3fd3ac6623c68d0f5e28f9
17 changes: 7 additions & 10 deletions okhttp/src/main/java/io/grpc/okhttp/TlsServerHandshakerSocketFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,13 @@ public HandshakeResult handshake(Socket socket, Attributes attributes) throws IO
SSLSocket sslSocket = (SSLSocket) socket;
sslSocket.setUseClientMode(false);
connectionSpec.apply(sslSocket, false);
if (connectionSpec.supportsTlsExtensions()) {
Protocol expectedProtocol = Protocol.HTTP_2;
String negotiatedProtocol = OkHttpProtocolNegotiator.get().negotiate(
sslSocket,
null,
Collections.singletonList(expectedProtocol)
);
if (!expectedProtocol.toString().equals(negotiatedProtocol)) {
throw new IOException("Expected NPN/ALPN " + expectedProtocol + ": " + negotiatedProtocol);
}
Protocol expectedProtocol = Protocol.HTTP_2;
String negotiatedProtocol = OkHttpProtocolNegotiator.get().negotiate(
sslSocket,
null,
connectionSpec.supportsTlsExtensions() ? Collections.singletonList(expectedProtocol) : null);
if (!expectedProtocol.toString().equals(negotiatedProtocol)) {
throw new IOException("Expected NPN/ALPN " + expectedProtocol + ": " + negotiatedProtocol);
}
attributes = result.attributes.toBuilder()
.set(GrpcAttributes.ATTR_SECURITY_LEVEL, SecurityLevel.PRIVACY_AND_INTEGRITY)
Expand Down
Loading