This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-4.0 by this push:
new 39b42ccd2f Update RMI object marshalling restrictions
39b42ccd2f is described below
commit 39b42ccd2facde366d6d3fdbcc1aa221a5d0c14d
Author: Brandon Williams <[email protected]>
AuthorDate: Wed Nov 13 12:39:36 2024 -0600
Update RMI object marshalling restrictions
Patch by brandonwilliams; reviewed by paulo for CASSANDRA-20076
---
.../org/apache/cassandra/utils/JMXServerUtils.java | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/java/org/apache/cassandra/utils/JMXServerUtils.java
b/src/java/org/apache/cassandra/utils/JMXServerUtils.java
index 49ff5a07d2..bbe09e8636 100644
--- a/src/java/org/apache/cassandra/utils/JMXServerUtils.java
+++ b/src/java/org/apache/cassandra/utils/JMXServerUtils.java
@@ -56,6 +56,7 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.auth.jmx.AuthenticationProxy;
+import static
org.apache.cassandra.config.CassandraRelevantProperties.JAVA_VERSION;
import static
org.apache.cassandra.config.CassandraRelevantProperties.COM_SUN_MANAGEMENT_JMXREMOTE_ACCESS_FILE;
import static
org.apache.cassandra.config.CassandraRelevantProperties.COM_SUN_MANAGEMENT_JMXREMOTE_AUTHENTICATE;
import static
org.apache.cassandra.config.CassandraRelevantProperties.COM_SUN_MANAGEMENT_JMXREMOTE_PASSWORD_FILE;
@@ -65,6 +66,7 @@ import static
org.apache.cassandra.config.CassandraRelevantProperties.COM_SUN_MA
import static
org.apache.cassandra.config.CassandraRelevantProperties.COM_SUN_MANAGEMENT_JMXREMOTE_SSL_ENABLED_PROTOCOLS;
import static
org.apache.cassandra.config.CassandraRelevantProperties.COM_SUN_MANAGEMENT_JMXREMOTE_SSL_NEED_CLIENT_AUTH;
+
public class JMXServerUtils
{
private static final Logger logger =
LoggerFactory.getLogger(JMXServerUtils.class);
@@ -100,6 +102,8 @@ public class JMXServerUtils
// via a JAAS configuration entry, or one which delegates to the
standard file based authenticator.
// Authn is disabled if com.sun.management.jmxremote.authenticate=false
env.putAll(configureJmxAuthentication());
+ // Secure credential passing to avoid deserialization attacks
+ env.putAll(configureSecureCredentials());
// Configure authz - if a custom proxy class is specified an instance
will be returned.
// If not, but a location for the standard access file is set in
system properties, the
@@ -151,6 +155,19 @@ public class JMXServerUtils
return createJMXServer(port, null, local);
}
+ private static Map<String, Object> configureSecureCredentials()
+ {
+ Map<String, Object> env = new HashMap<>();
+ if (JAVA_VERSION.getString().startsWith("1.8"))
+ {
+ env.put("jmx.remote.rmi.server.credential.types",
+ new String[] { String[].class.getName(),
String.class.getName() });
+ } else {
+ env.put("jmx.remote.rmi.server.credentials.filter.pattern",
String.class.getName() + ";!*");
+ }
+ return env;
+ }
+
private static Map<String, Object> configureJmxAuthentication()
{
Map<String, Object> env = new HashMap<>();
@@ -184,8 +201,6 @@ public class JMXServerUtils
env.put(JMXConnectorServer.AUTHENTICATOR, new
JMXPluggableAuthenticatorWrapper(env));
}
- env.put("jmx.remote.rmi.server.credential.types",
- new String[] { String[].class.getName(), String.class.getName() });
return env;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
