Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.x] Optimize privilege evaluation for index permissions across '*' index pattern (i.e. all_access role) #4926

Merged
merged 4 commits into from
Dec 9, 2024
Merged

[2.x] Optimize privilege evaluation for index permissions across '*' index pattern (i.e. all_access role) #4926

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af69183
Optimize privilege evaluation for all_access role
cwperks Nov 21, 2024
aa50a9a
Create a constant
cwperks Nov 21, 2024
53ada80
Add tests
cwperks Nov 22, 2024
30d457c
Remove call to getUnresolvedIndexPatterns
cwperks Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/main/java/org/opensearch/security/securityconf/ConfigModelV7.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public class ConfigModelV7 extends ConfigModel {
private RoleMappingHolder roleMappingHolder;
private SecurityDynamicConfiguration<RoleV7> roles;
private SecurityDynamicConfiguration<TenantV7> tenants;
private final static Set<String> ALL_INDICES = Set.of("*");

public ConfigModelV7(
SecurityDynamicConfiguration<RoleV7> roles,
Expand Down Expand Up @@ -1000,12 +1001,15 @@ private static boolean impliesTypePerm(
if (resolved.isLocalAll()) {
indexMatcherAndPermissions = ipatterns.stream()
.filter(indexPattern -> "*".equals(indexPattern.getUnresolvedIndexPattern(user)))
.map(p -> new IndexMatcherAndPermissions(p.attemptResolveIndexNames(user, resolver, cs), p.perms))
.map(p -> new IndexMatcherAndPermissions(ALL_INDICES, p.perms))
.toArray(IndexMatcherAndPermissions[]::new);
} else {
indexMatcherAndPermissions = ipatterns.stream()
.map(p -> new IndexMatcherAndPermissions(p.attemptResolveIndexNames(user, resolver, cs), p.perms))
.toArray(IndexMatcherAndPermissions[]::new);
indexMatcherAndPermissions = ipatterns.stream().map(p -> {
if ("*".equals(p.getUnresolvedIndexPattern(user))) {
return new IndexMatcherAndPermissions(ALL_INDICES, p.perms);
}
return new IndexMatcherAndPermissions(p.attemptResolveIndexNames(user, resolver, cs), p.perms);
}).toArray(IndexMatcherAndPermissions[]::new);
}
return resolvedRequestedIndices.stream()
.allMatch(
Expand Down
Loading