You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by an...@apache.org on 2015/12/29 08:04:09 UTC
svn commit: r1722058 - in /lucene/dev/branches/lucene_solr_5_3: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/security/
solr/core/src/java/org/apache/solr/servlet/
solr/core/src/test/org/apache/solr/security/
Author: anshum
Date: Tue Dec 29 07:04:08 2015
New Revision: 1722058
URL: http://svn.apache.org/viewvc?rev=1722058&view=rev
Log:
SOLR-8167: Fix to get authorization to work with POST params (backport from branch_5x for 5.3.2 release)
Modified:
lucene/dev/branches/lucene_solr_5_3/ (props changed)
lucene/dev/branches/lucene_solr_5_3/solr/ (props changed)
lucene/dev/branches/lucene_solr_5_3/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_5_3/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_5_3/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java
lucene/dev/branches/lucene_solr_5_3/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
lucene/dev/branches/lucene_solr_5_3/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
Modified: lucene/dev/branches/lucene_solr_5_3/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/solr/CHANGES.txt?rev=1722058&r1=1722057&r2=1722058&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_5_3/solr/CHANGES.txt Tue Dec 29 07:04:08 2015
@@ -23,6 +23,8 @@ Bug Fixes
* SOLR-8059: &debug=results for distributed search when distrib.singlePass (sometimes activated
automatically) could result in an NPE. (David Smiley, Markus Jelsma)
+* SOLR-8167: Authorization framework does not work with POST params (noble)
+
================== 5.3.1 ==================
Bug Fixes
Modified: lucene/dev/branches/lucene_solr_5_3/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java?rev=1722058&r1=1722057&r2=1722058&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java (original)
+++ lucene/dev/branches/lucene_solr_5_3/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java Tue Dec 29 07:04:08 2015
@@ -459,7 +459,7 @@ public class RuleBasedAuthorizationPlugi
" update :{" +
" path:'/update/*'}," +
" read :{" +
- " path:['/update/*', '/get']}," +
+ " path:['/select', '/get']}," +
" config-edit:{" +
" method:POST," +
" path:'/config/*'}}");
Modified: lucene/dev/branches/lucene_solr_5_3/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java?rev=1722058&r1=1722057&r2=1722058&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java (original)
+++ lucene/dev/branches/lucene_solr_5_3/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java Tue Dec 29 07:04:08 2015
@@ -959,7 +959,7 @@ public class HttpSolrCall {
return new AuthorizationContext() {
@Override
public SolrParams getParams() {
- return getQueryParams();
+ return solrReq.getParams();
}
@Override
Modified: lucene/dev/branches/lucene_solr_5_3/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_3/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java?rev=1722058&r1=1722057&r2=1722058&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_3/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java (original)
+++ lucene/dev/branches/lucene_solr_5_3/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java Tue Dec 29 07:04:08 2015
@@ -163,6 +163,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) {
+
+ }
/* httpPost = new HttpPost(baseUrl + "/admin/authorization");
setBasicAuthHeader(httpPost, "harry", "HarryIsUberCool");