This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit b0ae3de1c91fbdb8bb50a129d0114ea3b9fea2df
Merge: a62f618b08 fbb3079144
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Tue Oct 18 22:56:53 2022 +0200
Merge branch 'cassandra-4.1' into trunk
* cassandra-4.1:
Fix JMX security vulnerabilities
CHANGES.txt | 1 +
ide/idea/workspace.xml | 2 +-
.../cassandra/auth/jmx/AuthorizationProxy.java | 70 ++++++++++++++++++++++
3 files changed, 72 insertions(+), 1 deletion(-)
diff --cc CHANGES.txt
index 96e3702566,ed8ea6eea5..f040d17477
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -124,8 -69,6 +124,9 @@@ Merged from 3.11
* Creating of a keyspace on insufficient number of replicas should filter
out gosspping-only members (CASSANDRA-17759)
* Suppress CVE-2022-25857 and other snakeyaml CVEs (CASSANDRA-17907)
Merged from 3.0:
++ * Harden JMX by resolving beanshooter issues (CASSANDRA-17921)
+ * Suppress CVE-2019-2684 (CASSANDRA-17965)
+ * Fix auto-completing "WITH" when creating a materialized view
(CASSANDRA-17879)
* Improve libjemalloc resolution in bin/cassandra (CASSANDRA-15767)
* Fix restarting of services on gossipping-only member (CASSANDRA-17752)
* Fix scrubber falling into infinite loop when the last partition is broken
(CASSANDRA-17862)
diff --cc ide/idea/workspace.xml
index 321edd8024,8851d7e283..a89921cc77
--- a/ide/idea/workspace.xml
+++ b/ide/idea/workspace.xml
@@@ -187,7 -187,7 +187,7 @@@
<configuration default="false" name="Cassandra" type="Application"
factoryName="Application">
<extension name="coverage" enabled="false" merge="false"
sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME"
value="org.apache.cassandra.service.CassandraDaemon" />
- <option name="VM_PARAMETERS" value="-Dcassandra-foreground=yes
-Dcassandra.config=file://$PROJECT_DIR$/conf/cassandra.yaml
-Dcassandra.storagedir=$PROJECT_DIR$/data
-Dlogback.configurationFile=file://$PROJECT_DIR$/conf/logback.xml
-Dcassandra.logdir=$PROJECT_DIR$/data/logs
-Djava.library.path=$PROJECT_DIR$/lib/sigar-bin -Dcom.sun.management.jmxremote
-Dcom.sun.management.jmxremote.port=7199
-Dcom.sun.management.jmxremote.local.only=false
-Dcom.sun.management.jmxremote.authenticate [...]
- <option name="VM_PARAMETERS" value="-Dcassandra-foreground=yes
-Dcassandra.config=file://$PROJECT_DIR$/conf/cassandra.yaml
-Dcassandra.storagedir=$PROJECT_DIR$/data
-Dlogback.configurationFile=file://$PROJECT_DIR$/conf/logback.xml
-Dcassandra.logdir=$PROJECT_DIR$/data/logs
-Djava.library.path=$PROJECT_DIR$/lib/sigar-bin -Dcassandra.jmx.local.port=7199
-ea -Xmx1G
-Dcassandra.reads.thresholds.coordinator.defensive_checks_enabled=true" />
++ <option name="VM_PARAMETERS" value="-Dcassandra-foreground=yes
-Dcassandra.config=file://$PROJECT_DIR$/conf/cassandra.yaml
-Dcassandra.storagedir=$PROJECT_DIR$/data
-Dlogback.configurationFile=file://$PROJECT_DIR$/conf/logback.xml
-Dcassandra.logdir=$PROJECT_DIR$/data/logs
-Djava.library.path=$PROJECT_DIR$/lib/sigar-bin -Dcassandra.jmx.local.port=7199
-ea -Xmx1G
-Dcassandra.reads.thresholds.coordinator.defensive_checks_enabled=true
-XX:HeapDumpPath=build/test" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
