Skip to content

[9.0] Fix FileAccessTreeTests#testDuplicateExclusivePaths to work on windows (#124430) #124539

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 1 commit into from
Mar 11, 2025
Merged

[9.0] Fix FileAccessTreeTests#testDuplicateExclusivePaths to work on windows (#124430) #124539

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 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 @@ -365,17 +365,17 @@ public void testDuplicatePrunedPaths() {

public void testDuplicateExclusivePaths() {
// Bunch o' handy definitions
var originalFileData = FileData.ofPath(path("/a/b"), READ).withExclusive(true);
var fileDataWithWriteMode = FileData.ofPath(path("/a/b"), READ_WRITE).withExclusive(true);
var pathAB = path("/a/b");
var pathCD = path("/c/d");
var originalFileData = FileData.ofPath(pathAB, READ).withExclusive(true);
var fileDataWithWriteMode = FileData.ofPath(pathAB, READ_WRITE).withExclusive(true);
var original = new ExclusiveFileEntitlement("component1", "module1", new FilesEntitlement(List.of(originalFileData)));
var differentComponent = new ExclusiveFileEntitlement("component2", original.moduleName(), original.filesEntitlement());
var differentModule = new ExclusiveFileEntitlement(original.componentName(), "module2", original.filesEntitlement());
var differentPath = new ExclusiveFileEntitlement(
original.componentName(),
original.moduleName(),
new FilesEntitlement(
List.of(FileData.ofPath(path("/c/d"), originalFileData.mode()).withExclusive(originalFileData.exclusive()))
)
new FilesEntitlement(List.of(FileData.ofPath(pathCD, originalFileData.mode()).withExclusive(originalFileData.exclusive())))
);
var differentMode = new ExclusiveFileEntitlement(
original.componentName(),
Expand All @@ -387,7 +387,7 @@ public void testDuplicateExclusivePaths() {
original.moduleName(),
new FilesEntitlement(List.of(originalFileData.withPlatform(WINDOWS)))
);
var originalExclusivePath = new ExclusivePath("component1", Set.of("module1"), normalizePath(path("/a/b")));
var originalExclusivePath = new ExclusivePath("component1", Set.of("module1"), normalizePath(pathAB));

// Some basic tests

Expand All @@ -409,12 +409,17 @@ public void testDuplicateExclusivePaths() {
originalExclusivePath,
new ExclusivePath("component2", Set.of(original.moduleName()), originalExclusivePath.path()),
new ExclusivePath(original.componentName(), Set.of("module2"), originalExclusivePath.path()),
new ExclusivePath(original.componentName(), Set.of(original.moduleName()), normalizePath(path("/c/d")))
new ExclusivePath(original.componentName(), Set.of(original.moduleName()), normalizePath(pathCD))
);
var iae = expectThrows(IllegalArgumentException.class, () -> buildExclusivePathList(distinctEntitlements, TEST_PATH_LOOKUP));
var pathABString = pathAB.toAbsolutePath().toString();
assertThat(
iae.getMessage(),
equalTo("Path [/a/b] is already exclusive to [component1][module1], cannot add exclusive access for [component2][module1]")
equalTo(
"Path ["
+ pathABString
+ "] is already exclusive to [component1][module1], cannot add exclusive access for [component2][module1]"
)
);

var equivalentEntitlements = List.of(original, differentMode, differentPlatform);
Expand Down