Support JDK 1.8.0_252 #964
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ignasi35
reviewed
May 11, 2020
| .map(javaCtx => builder.negotiationType(NegotiationType.TLS).sslContext(nettyHttp2SslContext(javaCtx))) | ||
| builder = settings.trustManager | ||
| .map(trustManager => { | ||
| val nettySslContext = GrpcSslContexts.forClient().trustManager(trustManager).build() |
There was a problem hiding this comment.
Then, we'd also invoke .keyManager on the builder here...
| nettySslContextField.set(nettySslContext, javaSslContext) | ||
|
|
||
| nettySslContext | ||
| } |
| new DefaultKeyManagerFactoryWrapper(sslConfigSettings.keyManagerConfig.algorithm), | ||
| new DefaultTrustManagerFactoryWrapper(sslConfigSettings.trustManagerConfig.algorithm)).build() | ||
| sslContext | ||
| } |
There was a problem hiding this comment.
Maybe we can still use this code but, instead of returning SSLContext return a trustManager and a keyManager build using ssl-config's Default{Key,Trust}ManagerFactoryWrapper.
raboof
force-pushed
the
support-jdk-1.8.0_252
branch
from
1ce1f80
to
daf5b0a
Compare
|
@raboof WDYT about |
ignasi35
approved these changes
May 12, 2020
This makes it possible to leverage upstreams' OpenSSL support, which is especially useful now that the JDK implementation doesn't work with JDK 1.8.0-252
Not all scripted tests work because they don't have the right resolvers, but I verified gen-scala-server/00-interop works with 1.8.0_252 with this change.
raboof
force-pushed
the
support-jdk-1.8.0_252
branch
from
e795097
to
b5b50ce
Compare
Sounds useful to add, but let's merge this first |
dwhjames
added a commit
to dwhjames/akka-grpc
that referenced
this pull request
Aug 3, 2022
Inserting a JDK `javax.net.ssl.SSLContext` into Netty originated in commit https://github.com/richdougherty/akka-grpc/blob/aa05239c6cddcb20dfa0770e8e8e7649e3bbaaef/runtime/src/main/scala/akka/grpc/internal/NettyClientUtils.scala#L59-L82 in PR akka#266 It was removed in PR akka#964 to address Issue akka#946 It was returned in PR akka#979 to address Issue akka#978 --- Original comment was ```scala // FIXME: Create a JdkSslContext using a normal constructor. Need to work out sensible values for all args first. // In the meantime, use a Netty SslContextBuild to create a JdkSslContext, then use reflection to patch the // object's internal SSLContext. It's not pretty, but it gets something working for now. ``` --- This commit addresses the original `FIXME` comment, and avoids using deprecated constructors on `io.grpc.netty.shaded.io.netty.handler.ssl.JdkSslContext`
raboof
pushed a commit
that referenced
this pull request
Aug 22, 2022
Inserting a JDK `javax.net.ssl.SSLContext` into Netty originated in commit https://github.com/richdougherty/akka-grpc/blob/aa05239c6cddcb20dfa0770e8e8e7649e3bbaaef/runtime/src/main/scala/akka/grpc/internal/NettyClientUtils.scala#L59-L82 in PR #266 It was removed in PR #964 to address Issue #946 It was returned in PR #979 to address Issue #978 --- Original comment was ```scala // FIXME: Create a JdkSslContext using a normal constructor. Need to work out sensible values for all args first. // In the meantime, use a Netty SslContextBuild to create a JdkSslContext, then use reflection to patch the // object's internal SSLContext. It's not pretty, but it gets something working for now. ``` --- This commit addresses the original `FIXME` comment, and avoids using deprecated constructors on `io.grpc.netty.shaded.io.netty.handler.ssl.JdkSslContext`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
References #946