RATIS-2064. Bump Netty to 4.1.109 #50
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
szetszwo
approved these changes
Apr 29, 2024
Comment on lines
+27
to
+42
| "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", | ||
| "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", | ||
| "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", | ||
| "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", | ||
| "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", | ||
| "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA", | ||
| "TLS_RSA_WITH_AES_128_GCM_SHA256", | ||
| "TLS_RSA_WITH_AES_128_CBC_SHA", | ||
| "SSL_RSA_WITH_3DES_EDE_CBC_SHA")); | ||
|
|
||
| // "RSA" in this case refers to the key exchange algorithm, | ||
| // "SHA" refers to the message digest algorithm to provide integrity | ||
| // "NULL" is the encryption algorithm, to disable encryption. | ||
| // TODO: support NULL cipher from tcnative | ||
| private final List<String> tlsCipherSuitesNoEncryption = Collections.singletonList("TLS_RSA_WITH_AES_128_GCM_SHA256"); | ||
| "TLS_RSA_WITH_AES_256_CBC_SHA", | ||
| "TLS_AES_128_GCM_SHA256", | ||
| "TLS_AES_256_GCM_SHA384", | ||
| "TLS_AES_128_GCM_SHA256", | ||
| "TLS_AES_256_GCM_SHA384", | ||
| "TLS_AES_128_GCM_SHA256", | ||
| "TLS_AES_256_GCM_SHA384", | ||
| "TLS_CHACHA20_POLY1305_SHA256" |
There was a problem hiding this comment.
@adoroszlai , How did you find out this list?
There was a problem hiding this comment.
I took the list from this log message emitted by Netty during the test:
[main] DEBUG ssl.OpenSsl (OpenSsl.java:<clinit>(402)) - Default cipher suites (OpenSSL): [TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, TLS_RSA_WITH_AES_128_GCM_SHA256, TLS_RSA_WITH_AES_128_CBC_SHA, TLS_RSA_WITH_AES_256_CBC_SHA, TLS_AES_128_GCM_SHA256, TLS_AES_256_GCM_SHA384, TLS_AES_128_GCM_SHA256, TLS_AES_256_GCM_SHA384, TLS_AES_128_GCM_SHA256, TLS_AES_256_GCM_SHA384, TLS_CHACHA20_POLY1305_SHA256]
I don't know why the old list (particularly the NoEncryption one) wouldn't work. The list of default ciphers is the same for both versions.
The following mapping is no longer present with new Netty:
[main] DEBUG ssl.CipherSuiteConverter (CipherSuiteConverter.java:cacheFromOpenSsl(352)) - Cipher suite mapping: TLS_RSA_WITH_3DES_EDE_CBC_SHA => DES-CBC3-SHA
[main] DEBUG ssl.CipherSuiteConverter (CipherSuiteConverter.java:cacheFromOpenSsl(353)) - Cipher suite mapping: SSL_RSA_WITH_3DES_EDE_CBC_SHA => DES-CBC3-SHA
so I first removed that from the original list, but that would not fix the problem.
SzyWilliam
approved these changes
Apr 30, 2024
There was a problem hiding this comment.
+1 the changes look good to me. Thanks @adoroszlai for bumping Netty and tweak the list.
|
Thanks @szetszwo, @SzyWilliam for the review. |
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.
What changes were proposed in this pull request?
Bump Netty to latest (4.1.109 currently).
I had to tweak cipher list in tests to make
GrpcSslTestto pass. It was failing withStacklessSSLHandshakeException: Connection closed while SSL/TLS handshake was in progressdue to one of the changes in Netty 4.1.108 related to SSL.https://issues.apache.org/jira/browse/RATIS-2064
How was this patch tested?
CI:
https://github.com/adoroszlai/ratis-thirdparty/actions/runs/8877229601