Skip to content
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

Jump to bottom

RATIS-2064. Bump Netty to 4.1.109 #50

Merged
merged 2 commits into from
Apr 30, 2024
Merged

RATIS-2064. Bump Netty to 4.1.109 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73f4433
RATIS-2064. Bump netty to 4.1.109
adoroszlai Apr 27, 2024
a10a102
update list of cipher suites
adoroszlai Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<!--Version of grpc to be shaded -->
<shaded.grpc.version>1.58.0</shaded.grpc.version>
<!--Version of Netty to be shaded -->
<shaded.netty.version>4.1.100.Final</shaded.netty.version>
<shaded.netty.version>4.1.109.Final</shaded.netty.version>
<!--Version of dropwizard to be shaded -->
<shaded.dropwizard.version>4.2.21</shaded.dropwizard.version>

Expand Down
25 changes: 17 additions & 8 deletions test/src/main/java/org/apache/ratis/thirdparty/demo/common/SslConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,23 @@
public class SslConfig {
// TODO: allow configure cipher suites
private final List<String> tlsCipherSuitesWithEncryption = Collections.unmodifiableList(Arrays.asList(
"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"
Comment on lines +27 to +42
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@adoroszlai , How did you find out this list?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

));

private final boolean encryption;

Expand All @@ -49,7 +57,8 @@ public List<String> getTlsCipherSuitesWithEncryption() {
}

public List<String> getTlsCipherSuitesNoEncryption() {
return tlsCipherSuitesNoEncryption;
// TODO define list without encrpytion
return tlsCipherSuitesWithEncryption;
}

}