From 99f96862b457874cf2e8d0541a573c244e368778 Mon Sep 17 00:00:00 2001 From: Lee Hinman Date: Mon, 9 Jan 2017 11:16:08 -0700 Subject: [PATCH] Add subrequest versions of index and delete actions to `isCompositeAction` Original commit: elastic/x-pack-elasticsearch@0e0a74eaea6e09487c9dc90d51ae5c3f06b3cb22 --- .../xpack/security/authz/AuthorizationService.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java index 2abf304213c..b82955a21c3 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/security/authz/AuthorizationService.java @@ -335,10 +335,19 @@ public class AuthorizationService extends AbstractComponent { } } + private static String IndexActionSubRequestPrimary = IndexAction.NAME + "[p]"; + private static String IndexActionSubRequestReplica = IndexAction.NAME + "[r]"; + private static String DeleteActionSubRequestPrimary = DeleteAction.NAME + "[p]"; + private static String DeleteActionSubRequestReplica = DeleteAction.NAME + "[r]"; + private static boolean isCompositeAction(String action) { return action.equals(BulkAction.NAME) || action.equals(IndexAction.NAME) || action.equals(DeleteAction.NAME) || + action.equals(IndexActionSubRequestPrimary) || + action.equals(IndexActionSubRequestReplica) || + action.equals(DeleteActionSubRequestPrimary) || + action.equals(DeleteActionSubRequestReplica) || action.equals(MultiGetAction.NAME) || action.equals(MultiTermVectorsAction.NAME) || action.equals(MultiSearchAction.NAME) ||