|
@@ -211,14 +211,22 @@ public final class LimitedRole implements Role {
|
|
|
Set<String> checkForPrivileges,
|
|
|
@Nullable ResourcePrivilegesMap.Builder resourcePrivilegesMapBuilder
|
|
|
) {
|
|
|
- boolean baseRoleCheck = baseRole.indices()
|
|
|
- .checkResourcePrivileges(checkForIndexPatterns, allowRestrictedIndices, checkForPrivileges, resourcePrivilegesMapBuilder);
|
|
|
+ boolean baseRoleCheck = baseRole.checkIndicesPrivileges(
|
|
|
+ checkForIndexPatterns,
|
|
|
+ allowRestrictedIndices,
|
|
|
+ checkForPrivileges,
|
|
|
+ resourcePrivilegesMapBuilder
|
|
|
+ );
|
|
|
if (false == baseRoleCheck && null == resourcePrivilegesMapBuilder) {
|
|
|
// short-circuit only if not interested in the detailed individual check results
|
|
|
return false;
|
|
|
}
|
|
|
- boolean limitedByRoleCheck = limitedByRole.indices()
|
|
|
- .checkResourcePrivileges(checkForIndexPatterns, allowRestrictedIndices, checkForPrivileges, resourcePrivilegesMapBuilder);
|
|
|
+ boolean limitedByRoleCheck = limitedByRole.checkIndicesPrivileges(
|
|
|
+ checkForIndexPatterns,
|
|
|
+ allowRestrictedIndices,
|
|
|
+ checkForPrivileges,
|
|
|
+ resourcePrivilegesMapBuilder
|
|
|
+ );
|
|
|
return baseRoleCheck && limitedByRoleCheck;
|
|
|
}
|
|
|
|