From 96f8d6590b5591d0c1ef5f7e5b6d163dbb79de88 Mon Sep 17 00:00:00 2001 From: Albert Zaharovits Date: Sun, 15 Aug 2021 22:04:39 +0300 Subject: [PATCH] Avoid redundant available indices check --- .../cluster/metadata/IndexAbstractionResolver.java | 2 +- .../xpack/security/authz/IndicesAndAliasesResolver.java | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexAbstractionResolver.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexAbstractionResolver.java index f29ddef978963..27ce998b378af 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexAbstractionResolver.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexAbstractionResolver.java @@ -103,7 +103,7 @@ public List resolveIndexAbstractions(Iterable indices, IndicesOp } else if (dateMathName.equals(indexAbstraction)) { if (minus) { finalIndices.remove(indexAbstraction); - } else { + } else if (indicesOptions.ignoreUnavailable() == false || availableIndexAbstractions.contains(indexAbstraction)) { finalIndices.add(indexAbstraction); } } diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolver.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolver.java index 942ef8cf5c847..47bda2f8e5f99 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolver.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolver.java @@ -149,11 +149,6 @@ ResolvedIndices resolveIndicesAndAliases(String action, IndicesRequest indicesRe } List replaced = indexAbstractionResolver.resolveIndexAbstractions(split.getLocal(), indicesOptions, metadata, authorizedIndices, replaceWildcards, indicesRequest.includeDataStreams()); - if (indicesOptions.ignoreUnavailable()) { - //out of all the explicit names (expanded from wildcards and original ones that were left untouched) - //remove all the ones that the current user is not authorized for and ignore them - replaced = replaced.stream().filter(authorizedIndices::contains).collect(Collectors.toList()); - } resolvedIndicesBuilder.addLocal(replaced); resolvedIndicesBuilder.addRemote(split.getRemote()); }