Fix theme resource loading on Windows, and enable additional test in …

…jdk-integration-tests (keycloak#33512) Closes keycloak#33508 Signed-off-by: stianst <stianst@gmail.com>
miquelsi · Oct 3, 2024 · 6092524 · 6092524
1 parent de151e6
commit 6092524
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/services/src/main/java/org/keycloak/theme/ResourceLoader.java b/services/src/main/java/org/keycloak/theme/ResourceLoader.java
@@ -15,7 +15,12 @@ public static InputStream getResourceAsStream(String root, String resource) thro
         Path rootPath = Path.of("/", root).normalize().toAbsolutePath();
         Path resourcePath = rootPath.resolve(resource).normalize().toAbsolutePath();
         if (resourcePath.startsWith(rootPath)) {
-            URL url = classLoader().getResource(resourcePath.toString().substring(1));
+            if (File.separatorChar == '/') {
+                resource = resourcePath.toString().substring(1);
+            } else {
+                resource = resourcePath.toString().substring(2).replace('\\', '/');
+            }
+            URL url = classLoader().getResource(resource);
             return url != null ? url.openStream() : null;
         } else {
             return null;

diff --git a/testsuite/integration-arquillian/tests/base/testsuites/jdk-suite b/testsuite/integration-arquillian/tests/base/testsuites/jdk-suite
@@ -15,3 +15,4 @@ SSOTest
 SamlClientTest
 TransactionsTest
 X509BrowserLoginTest
+ThemeResourceProviderTest