Skip to content

Security: improve exact index matching performance #36017

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

Merged
merged 2 commits into from
Nov 29, 2018
Merged

Security: improve exact index matching performance #36017

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb610ef
Security: improve exact index matching performance
jaymode Nov 28, 2018
341a58d
address review feedback
jaymode Nov 29, 2018
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
32 changes: 32 additions & 0 deletions ...c/main/java/org/elasticsearch/xpack/core/security/authz/permission/IndicesPermission.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,38 @@ public IndicesPermission(Group... groups) {
}

static Predicate<String> indexMatcher(List<String> indices) {
Set<String> exactMatch = new HashSet<>();
List<String> nonExactMatch = new ArrayList<>();
for (String indexPattern : indices) {
if (indexPattern.startsWith("/")) {
Copy link
Contributor

@tvernum tvernum Nov 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The existing Automatons code throws an exception if a pattern starts with / but doesn't end with /.
So we could simplify all this checking down to a single if/else and still be compatible with existing behaviour.

if (indexPattern.startsWith("/") || indexPattern.contains("*") || indexPattern.contains("?")) {
    nonExactMatch.add(indexPattern);
} else {
    exactMatch.add(indexPattern);
}

I don't care strongly, but shorter and simpler seems nicer.

Copy link
Member Author

@jaymode jaymode Nov 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++ thanks for noticing that. I misread the if statement in Automatons

if (indexPattern.endsWith("/") || indexPattern.contains("*") || indexPattern.contains("?")) {
nonExactMatch.add(indexPattern);
} else {
exactMatch.add(indexPattern);
}
} else if (indexPattern.contains("*") || indexPattern.contains("?")) {
nonExactMatch.add(indexPattern);
} else {
exactMatch.add(indexPattern);
}
}

if (exactMatch.isEmpty() && nonExactMatch.isEmpty()) {
return s -> false;
} else if (exactMatch.isEmpty()) {
return buildAutomataPredicate(nonExactMatch);
} else if (nonExactMatch.isEmpty()) {
return buildExactMatchPredicate(exactMatch);
} else {
return buildExactMatchPredicate(exactMatch).or(buildAutomataPredicate(nonExactMatch));
}
}

private static Predicate<String> buildExactMatchPredicate(Set<String> indices) {
return indices::contains;
}

private static Predicate<String> buildAutomataPredicate(List<String> indices) {
try {
return Automatons.predicate(indices);
} catch (TooComplexToDeterminizeException e) {
Expand Down