community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing Filstream closing issue and few formatting errors

Browse Source
This commit is contained in:
Jasintha 2017-07-11 12:56:48 +05:30
parent 99b74e12bd
commit 4bae413f72
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/util/Utils.java
View File

@ -74,7 +74,6 @@ public class Utils {
} }
public static Client getSSLClient() { public static Client getSSLClient() {
boolean isIgnoreHostnameVerification = Boolean.parseBoolean(System.getProperty("org.wso2.ignoreHostnameVerification")); boolean isIgnoreHostnameVerification = Boolean.parseBoolean(System.getProperty("org.wso2.ignoreHostnameVerification"));
if(isIgnoreHostnameVerification) { if(isIgnoreHostnameVerification) {
return new Client.Default(getSimpleTrustedSSLSocketFactory(), new HostnameVerifier() { return new Client.Default(getSimpleTrustedSSLSocketFactory(), new HostnameVerifier() {
@ -82,7 +81,6 @@ public class Utils {
public boolean verify(String s, SSLSession sslSession) { public boolean verify(String s, SSLSession sslSession) {
return true; return true;
} }
}); });
}else { }else {
return new Client.Default(getTrustedSSLSocketFactory(), null); return new Client.Default(getTrustedSSLSocketFactory(), null);
@ -125,7 +123,6 @@ public class Utils {
KeyStore trustStore = loadTrustStore(trustStoreLocation,trustStorePassword); KeyStore trustStore = loadTrustStore(trustStoreLocation,trustStorePassword);
return initSSLConnection(keyStore,keyStorePassword,trustStore); return initSSLConnection(keyStore,keyStorePassword,trustStore);
} catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException } catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException
|CertificateException | IOException | UnrecoverableKeyException e) { |CertificateException | IOException | UnrecoverableKeyException e) {
log.error("Error while creating the SSL socket factory due to "+e.getMessage(),e); log.error("Error while creating the SSL socket factory due to "+e.getMessage(),e);
@ -134,7 +131,6 @@ public class Utils {
} }
private static SSLSocketFactory initSSLConnection(KeyStore keyStore,String keyStorePassword,KeyStore trustStore) throws NoSuchAlgorithmException, UnrecoverableKeyException, private static SSLSocketFactory initSSLConnection(KeyStore keyStore,String keyStorePassword,KeyStore trustStore) throws NoSuchAlgorithmException, UnrecoverableKeyException,
KeyStoreException, KeyManagementException { KeyStoreException, KeyManagementException {
KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KEY_MANAGER_TYPE); KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KEY_MANAGER_TYPE);
@ -152,34 +148,22 @@ public class Utils {
private static KeyStore loadKeyStore(String keyStorePath, String ksPassword,String type) private static KeyStore loadKeyStore(String keyStorePath, String ksPassword,String type)
throws KeyStoreException, IOException, CertificateException, NoSuchAlgorithmException { throws KeyStoreException, IOException, CertificateException, NoSuchAlgorithmException {
InputStream fis = null; InputStream fileInputStream = null;
try { try {
char[] keypassChar = ksPassword.toCharArray(); char[] keypassChar = ksPassword.toCharArray();
KeyStore keyStore = KeyStore.getInstance(type); KeyStore keyStore = KeyStore.getInstance(type);
FileInputStream fileInputStream = new FileInputStream(keyStorePath); fileInputStream = new FileInputStream(keyStorePath);
keyStore.load(fileInputStream, keypassChar); keyStore.load(fileInputStream, keypassChar);
return keyStore; return keyStore;
} finally { } finally {
if (fis != null) { if (fileInputStream != null) {
fis.close(); fileInputStream.close();
} }
} }
} }
/**
* Loads the trustore
*
* @param trustStorePath - the trustore path in the filesystem.
* @param tsPassword - the truststore password
*/
private static KeyStore loadTrustStore(String trustStorePath, String tsPassword) private static KeyStore loadTrustStore(String trustStorePath, String tsPassword)
throws KeyStoreException, IOException, CertificateException, NoSuchAlgorithmException { throws KeyStoreException, IOException, CertificateException, NoSuchAlgorithmException {
return loadKeyStore(trustStorePath,tsPassword,TRUST_STORE_TYPE); return loadKeyStore(trustStorePath,tsPassword,TRUST_STORE_TYPE);
} }
} }