From 14fed747fb8f92034bf81edd78705edabb4e5152 Mon Sep 17 00:00:00 2001 From: javanna Date: Thu, 2 Oct 2014 16:43:09 +0200 Subject: [PATCH] Restore indices authorization for composite indices requests Original commit: elastic/x-pack-elasticsearch@64ae3bf5c10640a0081baa9460f83981a798c0d4 --- src/main/java/org/elasticsearch/shield/authz/Permission.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/elasticsearch/shield/authz/Permission.java b/src/main/java/org/elasticsearch/shield/authz/Permission.java index 3392d48762b..cff76423329 100644 --- a/src/main/java/org/elasticsearch/shield/authz/Permission.java +++ b/src/main/java/org/elasticsearch/shield/authz/Permission.java @@ -5,6 +5,7 @@ */ package org.elasticsearch.shield.authz; +import org.elasticsearch.action.CompositeIndicesRequest; import org.elasticsearch.action.IndicesRequest; import org.elasticsearch.cluster.metadata.MetaData; 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 // perform the check on the action name. Set indices = null; - if (request instanceof IndicesRequest) { + if (request instanceof IndicesRequest || request instanceof CompositeIndicesRequest) { indices = Collections.emptySet(); for (IndicesResolver resolver : indicesResolvers) { if (resolver.requestType().isInstance(request)) {