External-Mirrors/keycloak
2
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-10 15:32:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Stabilize ResourceLoaderTest on Windows (#42798)

Browse Source 
* use distinct filenames to properly test path traversal on Windows
* skip relative path test on certain environments, when temp and current directories are on different drives

Closes: #42795

Signed-off-by: Peter Zaoral <pzaoral@redhat.com>
This commit is contained in:
Peter Zaoral 2025-10-17 08:45:08 +02:00 committed by GitHub
parent 2567b572d1
commit a2ca406567
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
services/src/test/java/org/keycloak/theme/ResourceLoaderTest.java
View File

@ -21,16 +21,16 @@ public class ResourceLoaderTest {
public void testResource() throws IOException {
String parent = "dummy-resources/parent";
assertResourceAsStream(parent, "myresource.css", true, true);
assertResourceAsStream(parent, NONE + "myresource.css", false, true);
assertResourceAsStream(parent, SINGLE + "myresource.css", false, false);
assertResourceAsStream(parent, DOUBLE + "myresource.css", false, false);
assertResourceAsStream(parent, NONE + "forbidden.css", false, true);
assertResourceAsStream(parent, SINGLE + "forbidden.css", false, false);
assertResourceAsStream(parent, DOUBLE + "forbidden.css", false, false);
assertResourceAsStream(parent, "one/" + NONE + "myresource.css", true, true);
assertResourceAsStream(parent, "one/" + SINGLE + "myresource.css", false, false);
assertResourceAsStream(parent, "one/" + DOUBLE + "myresource.css", false, false);
assertResourceAsStream(parent, "one/" + SINGLE + SINGLE + "forbidden.css", false, false);
assertResourceAsStream(parent, "one/" + DOUBLE + DOUBLE + "forbidden.css", false, false);
assertResourceAsStream(parent, "one/two/" + NONE + NONE + "myresource.css", true, true);
assertResourceAsStream(parent, "one/" + NONE + NONE + "myresource.css", false, true);
assertResourceAsStream(parent, "one/" + NONE + NONE + "forbidden.css", false, true);
}
@Test
@ -40,19 +40,24 @@ public class ResourceLoaderTest {
File parent = new File(tempDirectory.toFile(), "resources");
Assert.assertTrue(parent.mkdir());
new FileOutputStream(new File(tempDirectory.toFile(), "myresource.css")).close();
new FileOutputStream(new File(tempDirectory.toFile(), "forbidden.css")).close();
new FileOutputStream(new File(parent, "myresource.css")).close();
assertFileAsStream(parent, "myresource.css", true, true);
assertFileAsStream(parent, NONE + "myresource.css", false, true);
assertFileAsStream(parent, SINGLE + "myresource.css", false, false);
assertFileAsStream(parent, DOUBLE + "myresource.css", false, false);
assertFileAsStream(parent, NONE + "forbidden.css", false, true);
assertFileAsStream(parent, SINGLE + SINGLE + "forbidden.css", false, false);
assertFileAsStream(parent, DOUBLE + DOUBLE + "forbidden.css", false, false);
assertFileAsStream(new File(tempDirectory.toFile(), "test/../resources/"), "myresource.css", true, true);
// relativize tmp folder to the current working directory, something like ../../../tmp/path
Path relativeParent = Paths.get(".").toAbsolutePath().relativize(parent.toPath());
assertFileAsStream(relativeParent.toFile(), "myresource.css", true, true);
Path currentDir = Paths.get(".").toAbsolutePath();
if (currentDir.getRoot().equals(parent.toPath().getRoot())) {
Path relativeParent = currentDir.relativize(parent.toPath());
assertFileAsStream(relativeParent.toFile(), "myresource.css", true, true);
} else {
System.out.println("Skipping relative path test due to temp directory and current directory being on different drives");
}
}
private void assertResourceAsStream(String parent, String resource, boolean expectValid, boolean expectResourceToExist) throws IOException {

0
services/src/test/resources/dummy-resources/myresource.css → services/src/test/resources/dummy-resources/forbidden.css
View File