honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore indices authorization for composite indices requests 

Original commit: elastic/x-pack-elasticsearch@64ae3bf5c1
This commit is contained in:
javanna 2014-10-02 16:43:09 +02:00 committed by Luca Cavanna
parent 5b1dd41f23
commit 14fed747fb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/elasticsearch/shield/authz/Permission.java
View File

@ -5,6 +5,7 @@
*/ */
package org.elasticsearch.shield.authz; package org.elasticsearch.shield.authz;
import org.elasticsearch.action.CompositeIndicesRequest;
import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.action.IndicesRequest;
import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.metadata.MetaData;
import org.elasticsearch.common.base.Predicate; import org.elasticsearch.common.base.Predicate;
@ -197,7 +198,7 @@ public interface Permission {
// so we only check indices if indeed the request is an actual IndicesRequest, if it's not, we only // so we only check indices if indeed the request is an actual IndicesRequest, if it's not, we only
// perform the check on the action name. // perform the check on the action name.
Set<String> indices = null; Set<String> indices = null;
if (request instanceof IndicesRequest) { if (request instanceof IndicesRequest || request instanceof CompositeIndicesRequest) {
indices = Collections.emptySet(); indices = Collections.emptySet();
for (IndicesResolver resolver : indicesResolvers) { for (IndicesResolver resolver : indicesResolvers) {
if (resolver.requestType().isInstance(request)) { if (resolver.requestType().isInstance(request)) {