Skip to content

fix keystore in rest template and http client by configuration #527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 26, 2020
Merged

fix keystore in rest template and http client by configuration #527

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2de4a2b
fix keystore in rest template and http client by configuration
pavel-jares-bcm Feb 26, 2020
9f54807
Merge branch 'master' into protectors/keystoreConfigurationFix
Feb 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions common-service-core/src/main/java/org/zowe/apiml/security/HttpsFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
*/
package org.zowe.apiml.security;

import org.zowe.apiml.message.log.ApimlLogger;
import org.zowe.apiml.message.yaml.YamlMessageServiceInstance;
import org.zowe.apiml.security.HttpsConfigError.ErrorCode;
import com.netflix.discovery.shared.transport.jersey.EurekaJerseyClientImpl.EurekaJerseyClientBuilder;
import lombok.Data;
import lombok.NoArgsConstructor;
Expand All @@ -27,6 +24,9 @@
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.ssl.SSLContextBuilder;
import org.apache.http.ssl.SSLContexts;
import org.zowe.apiml.message.log.ApimlLogger;
import org.zowe.apiml.message.yaml.YamlMessageServiceInstance;
import org.zowe.apiml.security.HttpsConfigError.ErrorCode;

import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
Expand Down Expand Up @@ -82,8 +82,13 @@ private ConnectionSocketFactory createIgnoringSslSocketFactory() {

private SSLContext createIgnoringSslContext() {
try {
return new SSLContextBuilder().loadTrustMaterial(null, (certificate, authType) -> true).setProtocol(config.getProtocol()).build();
} catch (NoSuchAlgorithmException | KeyStoreException | KeyManagementException e) {
KeyStore emptyKeystore = KeyStore.getInstance(KeyStore.getDefaultType());
emptyKeystore.load(null, null);
return new SSLContextBuilder()
.loadTrustMaterial(null, (certificate, authType) -> true)
.loadKeyMaterial(emptyKeystore, null)
.setProtocol(config.getProtocol()).build();
} catch (Exception e) {
apimlLog.log("org.zowe.apiml.common.errorInitSsl", e.getMessage());
throw new HttpsConfigError("Error initializing SSL/TLS context: " + e.getMessage(), e,
ErrorCode.SSL_CONTEXT_INITIALIZATION_FAILED, config);
Expand Down