Skip to content

Remove duplicate paths in FileAccessTree #123776

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 5 commits into from
Mar 3, 2025
Merged

Remove duplicate paths in FileAccessTree #123776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8326027
remove duplicate paths in FileAccessTree
jdconrad Feb 28, 2025
5fc36ba
Merge branch 'main' into prunedups
jdconrad Mar 1, 2025
b095bae
Merge branch 'main' into prunedups
ldematte Mar 1, 2025
8941820
Merge branch 'main' into prunedups
prdoyle Mar 3, 2025
de786cd
Merge branch 'main' into prunedups
prdoyle Mar 3, 2025
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
5 changes: 3 additions & 2 deletions ...ntitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/FileAccessTree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,15 @@ private FileAccessTree(
this.writePaths = pruneSortedPaths(writePaths).toArray(new String[0]);
}

private static List<String> pruneSortedPaths(List<String> paths) {
// package private for testing
static List<String> pruneSortedPaths(List<String> paths) {
List<String> prunedReadPaths = new ArrayList<>();
if (paths.isEmpty() == false) {
String currentPath = paths.get(0);
prunedReadPaths.add(currentPath);
for (int i = 1; i < paths.size(); ++i) {
String nextPath = paths.get(i);
if (isParent(currentPath, nextPath) == false) {
if (currentPath.equals(nextPath) == false && isParent(currentPath, nextPath) == false) {
prunedReadPaths.add(nextPath);
currentPath = nextPath;
}
Expand Down
6 changes: 6 additions & 0 deletions ...ement/src/test/java/org/elasticsearch/entitlement/runtime/policy/FileAccessTreeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,12 @@ public void testInvalidExclusiveAccess() {
assertThat(tree.canWrite(path("a")), is(false));
}

public void testDuplicatePrunedPaths() {
List<String> paths = List.of("/a", "/a", "/a/b", "/a/b", "/b/c", "b/c/d", "b/c/d", "b/c/d", "e/f", "e/f");
paths = FileAccessTree.pruneSortedPaths(paths);
assertEquals(List.of("/a", "/b/c", "b/c/d", "e/f"), paths);
}

public void testWindowsAbsolutPathAccess() {
assumeTrue("Specific to windows for paths with a root (DOS or UNC)", Platform.WINDOWS.isCurrent());

Expand Down