Fix resolving restricted indices after merging

jaymode · jaymode · commit b9a2c81ae3a3 · 2019-01-22T09:48:11.000-07:00
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/RBACEngine.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/authz/RBACEngine.java
@@ -304,11 +304,6 @@ static List<String> resolveAuthorizedIndicesFromRole(Role role, String action, M
                 indicesAndAliases.add(aliasOrIndex);
             }
         }
-
-        if (Arrays.asList(role.names()).contains(ReservedRolesStore.SUPERUSER_ROLE_DESCRIPTOR.getName()) == false) {
-            // we should filter out all of the security indices from wildcards
-            indicesAndAliases.removeAll(SecurityIndexManager.indexNames());
-        }
         return Collections.unmodifiableList(indicesAndAliases);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -304,11 +304,6 @@ static List<String> resolveAuthorizedIndicesFromRole(Role role, String action, M`
`304`	`304`	`indicesAndAliases.add(aliasOrIndex);`
`305`	`305`	`}`
`306`	`306`	`}`
`307`		`-`
`308`		`- if (Arrays.asList(role.names()).contains(ReservedRolesStore.SUPERUSER_ROLE_DESCRIPTOR.getName()) == false) {`
`309`		`- // we should filter out all of the security indices from wildcards`
`310`		`- indicesAndAliases.removeAll(SecurityIndexManager.indexNames());`
`311`		`- }`
`312`	`307`	`return Collections.unmodifiableList(indicesAndAliases);`
`313`	`308`	`}`
`314`	`309`