natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-4.0' into cassandra-4.1

This commit is contained in:
Ekaterina Dimitrova 2023-08-01 13:52:11 -04:00
parent a3e7558ebb 4a2a585ec0
commit fb7e4e7c48
5 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,5 +1,6 @@
4.1.4 4.1.4
Merged from 4.0: Merged from 4.0:
* Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582)
* Migrate Python optparse to argparse (CASSANDRA-17914) * Migrate Python optparse to argparse (CASSANDRA-17914)
Merged from 3.11: Merged from 3.11:
Merged from 3.0: Merged from 3.0:

5
src/java/org/apache/cassandra/config/EncryptionOptions.java
View File

@ -404,6 +404,11 @@ public class EncryptionOptions
return ap == null ? new String[0] : ap.toArray(new String[0]); return ap == null ? new String[0] : ap.toArray(new String[0]);
} }
public String[] cipherSuitesArray()
{
return cipher_suites == null ? null : cipher_suites.toArray(new String[0]);
}
public TlsEncryptionPolicy tlsEncryptionPolicy() public TlsEncryptionPolicy tlsEncryptionPolicy()
{ {
if (getOptional()) if (getOptional())

3
src/java/org/apache/cassandra/tools/BulkLoader.java
View File

@ -273,8 +273,9 @@ public class BulkLoader
// Temporarily override newSSLEngine to set accepted protocols until it is added to // Temporarily override newSSLEngine to set accepted protocols until it is added to
// RemoteEndpointAwareJdkSSLOptions. See CASSANDRA-13325 and CASSANDRA-16362. // RemoteEndpointAwareJdkSSLOptions. See CASSANDRA-13325 and CASSANDRA-16362.
RemoteEndpointAwareJdkSSLOptions sslOptions = new RemoteEndpointAwareJdkSSLOptions(sslContext, null) RemoteEndpointAwareJdkSSLOptions sslOptions = new RemoteEndpointAwareJdkSSLOptions(sslContext, clientEncryptionOptions.cipherSuitesArray())
{ {
@Override
protected SSLEngine newSSLEngine(SocketChannel channel, InetSocketAddress remoteEndpoint) protected SSLEngine newSSLEngine(SocketChannel channel, InetSocketAddress remoteEndpoint)
{ {
SSLEngine engine = super.newSSLEngine(channel, remoteEndpoint); SSLEngine engine = super.newSSLEngine(channel, remoteEndpoint);

1
test/distributed/org/apache/cassandra/distributed/test/SSTableLoaderEncryptionOptionsTest.java
View File

@ -98,6 +98,7 @@ public class SSTableLoaderEncryptionOptionsTest extends AbstractEncryptionOption
"--truststore", validTrustStorePath, "--truststore", validTrustStorePath,
"--truststore-password", validTrustStorePassword, "--truststore-password", validTrustStorePassword,
"--conf-path", "test/conf/sstableloader_with_encryption.yaml", "--conf-path", "test/conf/sstableloader_with_encryption.yaml",
"--ssl-ciphers", "TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA",
sstables_to_upload.absolutePath()); sstables_to_upload.absolutePath());
tool.assertOnCleanExit(); tool.assertOnCleanExit();
assertTrue(tool.getStdout().contains("Summary statistics")); assertTrue(tool.getStdout().contains("Summary statistics"));

3
tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
View File

@ -165,8 +165,9 @@ public class JavaDriverClient
// Temporarily override newSSLEngine to set accepted protocols until it is added to // Temporarily override newSSLEngine to set accepted protocols until it is added to
// RemoteEndpointAwareJdkSSLOptions. See CASSANDRA-13325 and CASSANDRA-16362. // RemoteEndpointAwareJdkSSLOptions. See CASSANDRA-13325 and CASSANDRA-16362.
RemoteEndpointAwareJdkSSLOptions sslOptions = new RemoteEndpointAwareJdkSSLOptions(sslContext, null) RemoteEndpointAwareJdkSSLOptions sslOptions = new RemoteEndpointAwareJdkSSLOptions(sslContext, encryptionOptions.cipherSuitesArray())
{ {
@Override
protected SSLEngine newSSLEngine(SocketChannel channel, InetSocketAddress remoteEndpoint) protected SSLEngine newSSLEngine(SocketChannel channel, InetSocketAddress remoteEndpoint)
{ {
SSLEngine engine = super.newSSLEngine(channel, remoteEndpoint); SSLEngine engine = super.newSSLEngine(channel, remoteEndpoint);