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

KEYCLOAK-4427

Browse source
This commit is contained in:
Bill Burke 2017-12-15 10:49:51 -05:00
parent e4a91c0706
commit e7c25f76a7
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,6 +21,7 @@ import org.keycloak.common.constants.GenericConstants;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream; import java.io.InputStream;
import java.security.KeyPair; import java.security.KeyPair;
import java.security.KeyStore; import java.security.KeyStore;
@ -43,9 +44,19 @@ public class KeystoreUtil {
public static KeyStore loadKeyStore(String filename, String password) throws Exception { public static KeyStore loadKeyStore(String filename, String password) throws Exception {
KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType()); KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
InputStream trustStream = (filename.startsWith(GenericConstants.PROTOCOL_CLASSPATH)) InputStream trustStream = null;
?KeystoreUtil.class.getResourceAsStream(filename.replace(GenericConstants.PROTOCOL_CLASSPATH, "")) if (filename.startsWith(GenericConstants.PROTOCOL_CLASSPATH)) {
:new FileInputStream(new File(filename)); String resourcePath = filename.replace(GenericConstants.PROTOCOL_CLASSPATH, "");
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()); trustStore.load(trustStream, password.toCharArray());
trustStream.close(); trustStream.close();
return trustStore; return trustStore;