libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

Merge pull request #1574 from stianst/master

Browse source 
Fix loading resources from theme
This commit is contained in:
Stian Thorgersen 2015-09-01 14:06:18 +02:00
commit 5177365c28
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
forms/common-themes/src/main/java/org/keycloak/theme/FolderTheme.java
View file

@ -18,6 +18,7 @@ public class FolderTheme implements Theme {
private String parentName;
private String importName;
private File themeDir;
private File resourcesDir;
private String name;
private Type type;
private final Properties properties;
@ -34,6 +35,8 @@ public class FolderTheme implements Theme {
parentName = properties.getProperty("parent");
importName = properties.getProperty("import");
}
resourcesDir = new File(themeDir, "resources");
}
@Override
@ -73,8 +76,13 @@ public class FolderTheme implements Theme {
if (File.separatorChar != '/') {
path = path.replace('/', File.separatorChar);
}
File file = new File(themeDir, "/resources/" + path);
return file.isFile() ? file.toURI().toURL() : null;
File file = new File(resourcesDir, path);
if (!file.isFile() || !file.getCanonicalPath().startsWith(resourcesDir.getCanonicalPath())) {
return null;
} else {
return file.toURI().toURL();
}
}
@Override