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

KEYCLOAK-15012 Fix issue with folder theme provider

Browse source
This commit is contained in:
stianst 2020-09-09 21:25:08 +02:00 committed by Marek Posolda
parent 2df62369c3
commit 1281f28bb8
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/src/main/java/org/keycloak/theme/FolderTheme.java
View file

@ -93,7 +93,7 @@ public class FolderTheme implements Theme {
}
File file = new File(resourcesDir, path);
if (!file.isFile() || !file.getCanonicalPath().startsWith(resourcesDir.getCanonicalPath())) {
if (!file.isFile() || !file.getCanonicalPath().startsWith(resourcesDir.getCanonicalPath() + File.separator)) {
return null;
} else {
return file.toURI().toURL().openStream();

10
services/src/main/java/org/keycloak/theme/FolderThemeProvider.java
View file

@ -84,7 +84,15 @@ public class FolderThemeProvider implements ThemeProvider {
}
private File getThemeDir(String name, Theme.Type type) {
return new File(themesDir, name + File.separator + type.name().toLowerCase());
File f = new File(themesDir, name + File.separator + type.name().toLowerCase());
try {
if (!f.getCanonicalPath().startsWith(themesDir.getCanonicalPath() + File.separator)) {
return null;
}
} catch (IOException e) {
return null;
}
return f;
}
}