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

Merge pull request #4864 from patriot1burke/master

Browse source 
KEYCLOAK-4427
This commit is contained in:
Bill Burke 2017-12-15 11:44:16 -05:00 committed by GitHub
commit 90b5dd60fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
common/src/main/java/org/keycloak/common/util/KeystoreUtil.java
View file

@ -43,9 +43,21 @@ public class KeystoreUtil {
public static KeyStore loadKeyStore(String filename, String password) throws Exception {
KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
InputStream trustStream = (filename.startsWith(GenericConstants.PROTOCOL_CLASSPATH))
?KeystoreUtil.class.getResourceAsStream(filename.replace(GenericConstants.PROTOCOL_CLASSPATH, ""))
:new FileInputStream(new File(filename));
InputStream trustStream = null;
if (filename.startsWith(GenericConstants.PROTOCOL_CLASSPATH)) {
String resourcePath = filename.replace(GenericConstants.PROTOCOL_CLASSPATH, "");
if (Thread.currentThread().getContextClassLoader() != null) {
trustStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(resourcePath);
}
if (trustStream == null) {
trustStream = KeystoreUtil.class.getResourceAsStream(resourcePath);
}
if (trustStream == null) {
throw new RuntimeException("Unable to find key store in classpath");
}
} else {
trustStream = new FileInputStream(new File(filename));
}
trustStore.load(trustStream, password.toCharArray());
trustStream.close();
return trustStore;