You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2015/10/16 18:57:05 UTC

svn commit: r1709056 - in /lucene/dev/trunk/solr: ./ core/src/java/org/apache/solr/security/ core/src/java/org/apache/solr/servlet/ core/src/test/org/apache/solr/security/

Author: noble
Date: Fri Oct 16 16:57:05 2015
New Revision: 1709056

URL: http://svn.apache.org/viewvc?rev=1709056&view=rev
Log:
SOLR-8167: Authorization framework does not work with POST params

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1709056&r1=1709055&r2=1709056&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Oct 16 16:57:05 2015
@@ -274,6 +274,9 @@ Bug Fixes
 
 * SOLR-8050: Partial update on document with multivalued date field fails to parse date and can
   also fail to remove dates in some cases. (Burkhard Buelte, Luc Vanlerberghe, shalin)
+
+* SOLR-8167: Authorization framework does not work with POST params (noble)
+
   
 Optimizations
 ----------------------

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java?rev=1709056&r1=1709055&r2=1709056&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java Fri Oct 16 16:57:05 2015
@@ -460,7 +460,7 @@ public class RuleBasedAuthorizationPlugi
           "    update :{" +
           "      path:'/update/*'}," +
           "    read :{" +
-          "      path:['/update/*', '/get']}," +
+          "      path:['/select', '/get']}," +
           "    config-edit:{" +
           "      method:POST," +
           "      path:'/config/*'}}");

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java?rev=1709056&r1=1709055&r2=1709056&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java Fri Oct 16 16:57:05 2015
@@ -957,7 +957,7 @@ public class HttpSolrCall {
     return new AuthorizationContext() {
       @Override
       public SolrParams getParams() {
-        return getQueryParams();
+        return solrReq.getParams();
       }
 
       @Override

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java?rev=1709056&r1=1709055&r2=1709056&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java Fri Oct 16 16:57:05 2015
@@ -165,6 +165,13 @@ public class BasicAuthIntegrationTest ex
     } catch (HttpSolrClient.RemoteSolrException e) {
 
     }
+    reload.setMethod(SolrRequest.METHOD.POST);
+    try {
+      rsp = solrClient.request(reload);
+      fail("must have failed");
+    } catch (HttpSolrClient.RemoteSolrException e) {
+
+    }
     cloudSolrClient.request(new CollectionAdminRequest.Reload()
         .setCollectionName(defaultCollName)
         .setBasicAuthCredentials("harry", "HarryIsUberCool"));