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

KEYCLOAK-829 Adjustment to KetstoreUtil to support loading keystore from classpath

Browse source
This commit is contained in:
Timon Veenstra 2014-11-06 21:43:49 +01:00
parent c0f377c8c7
commit 7c9e3f4555
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/src/main/java/org/keycloak/util/KeystoreUtil.java
View file

@ -2,6 +2,7 @@ package org.keycloak.util;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.InputStream;
import java.security.KeyStore; import java.security.KeyStore;
/** /**
@ -9,14 +10,16 @@ import java.security.KeyStore;
* @version $Revision: 1 $ * @version $Revision: 1 $
*/ */
public class KeystoreUtil { public class KeystoreUtil {
private static final String PROTOCOL_CLASSPATH = "classpath:";
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 KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
.getDefaultType()); InputStream trustStream = (filename.startsWith(PROTOCOL_CLASSPATH))
File truststoreFile = new File(filename); ?KeystoreUtil.class.getResourceAsStream(filename.replace(PROTOCOL_CLASSPATH, ""))
FileInputStream trustStream = new FileInputStream(truststoreFile); :new FileInputStream(new File(filename));
trustStore.load(trustStream, password.toCharArray()); trustStore.load(trustStream, password.toCharArray());
trustStream.close(); trustStream.close();
return trustStore; return trustStore;
} }
} }