Fix resolvers

Author: n1v0lg

server/src/main/java/org/elasticsearch/cluster/metadata/IndexAbstractionResolver.java

@@ -118,7 +118,7 @@ && isIndexVisible(
         return finalIndices;
     }
 
-    boolean selectorsMatch(String selectorString, String authorizedSelectorString) {
+    public static boolean selectorsMatch(String selectorString, String authorizedSelectorString) {
         IndexComponentSelector selector = IndexComponentSelector.getByKey(selectorString) == null
             ? IndexComponentSelector.DATA
             : IndexComponentSelector.getByKey(selectorString);

x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/IndicesAndAliasesResolver.java

@@ -324,15 +324,19 @@ ResolvedIndices resolveIndicesAndAliases(
                 }
                 if (indicesOptions.expandWildcardExpressions()) {
                     for (String authorizedIndex : authorizedIndices.all().get()) {
-                        if (IndexAbstractionResolver.isIndexVisible(
-                            "*",
-                            allIndicesPatternSelector,
-                            authorizedIndex,
-                            indicesOptions,
-                            projectMetadata,
-                            nameExpressionResolver,
-                            indicesRequest.includeDataStreams()
-                        )) {
+                        Tuple<String, String> tuple = IndexNameExpressionResolver.splitSelectorExpression(authorizedIndex);
+                        authorizedIndex = tuple.v1();
+                        String authorizedSelectorString = tuple.v2();
+                        if (IndexAbstractionResolver.selectorsMatch(allIndicesPatternSelector, authorizedSelectorString)
+                            && IndexAbstractionResolver.isIndexVisible(
+                                "*",
+                                allIndicesPatternSelector,
+                                authorizedIndex,
+                                indicesOptions,
+                                projectMetadata,
+                                nameExpressionResolver,
+                                indicesRequest.includeDataStreams()
+                            )) {
                             resolvedIndicesBuilder.addLocal(
                                 IndexNameExpressionResolver.combineSelectorExpression(authorizedIndex, allIndicesPatternSelector)
                             );
@@ -480,6 +484,10 @@ private static List<String> loadAuthorizedAliases(Supplier<Set<String>> authoriz
         List<String> authorizedAliases = new ArrayList<>();
         SortedMap<String, IndexAbstraction> existingAliases = projectMetadata.getIndicesLookup();
         for (String authorizedIndex : authorizedIndices.get()) {
+            Tuple<String, String> tuple = IndexNameExpressionResolver.splitSelectorExpression(authorizedIndex);
+            authorizedIndex = tuple.v1();
+            String authorizedSelectorString = tuple.v2();
+            // TODO skip failures here?
             IndexAbstraction indexAbstraction = existingAliases.get(authorizedIndex);
             if (indexAbstraction != null && indexAbstraction.getType() == IndexAbstraction.Type.ALIAS) {
                 authorizedAliases.add(authorizedIndex);