You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2019/03/26 05:32:38 UTC
[lucene-solr] branch branch_6_6 updated: SOLR-13301: Don't allow
modifications to jmx.serviceUrl via Config API
This is an automated email from the ASF dual-hosted git repository.
tflobbe pushed a commit to branch branch_6_6
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_6_6 by this push:
new 3750383 SOLR-13301: Don't allow modifications to jmx.serviceUrl via Config API
3750383 is described below
commit 375038364a15d26bdeae080a6a168b99bfaf78c8
Author: Tomas Fernandez Lobbe <tf...@apache.org>
AuthorDate: Mon Mar 25 22:32:24 2019 -0700
SOLR-13301: Don't allow modifications to jmx.serviceUrl via Config API
---
solr/CHANGES.txt | 3 +++
solr/core/src/resources/EditableSolrConfigAttributes.json | 1 -
solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 354c7cd..d2887df 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -47,6 +47,9 @@ Bug Fixes
* SOLR-12770: Make it possible to configure a host whitelist for distributed search
(Christine Poerschke, janhoy, Erick Erickson, Tomás Fernández Löbbe)
+* SOLR-13301: Don't allow modifications to jmx.serviceUrl via Config API (CVE-2019-0192)
+ (Michael Stepankin, Tomás Fernández Löbbe)
+
================== 6.6.5 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/core/src/resources/EditableSolrConfigAttributes.json b/solr/core/src/resources/EditableSolrConfigAttributes.json
index ce9d1ad..4237b29 100644
--- a/solr/core/src/resources/EditableSolrConfigAttributes.json
+++ b/solr/core/src/resources/EditableSolrConfigAttributes.json
@@ -58,7 +58,6 @@
"maxBooleanClauses":1},
"jmx":{
"agentId":0,
- "serviceUrl":0,
"rootName":0},
"requestDispatcher":{
"handleSelect":0,
diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java b/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java
index 633dde3..edce8a0 100644
--- a/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java
+++ b/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java
@@ -47,7 +47,7 @@ public class TestConfigOverlay extends LuceneTestCase {
assertTrue(isEditableProp("query.enableLazyFieldLoading", false, null));
assertTrue(isEditableProp("query.boolTofilterOptimizer", false, null));
assertTrue(isEditableProp("jmx.agentId", false, null));
- assertTrue(isEditableProp("jmx.serviceUrl", false, null));
+ assertFalse(isEditableProp("jmx.serviceUrl", false, null));
assertTrue(isEditableProp("jmx.rootName", false, null));
assertTrue(isEditableProp("requestDispatcher.requestParsers.multipartUploadLimitInKB", false, null));