Skip to content

[SCB-350] if the file not exist, make a warn log to trace it. make th… #749

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
liubao68 merged 1 commit into from
Jun 5, 2018
Merged

[SCB-350] if the file not exist, make a warn log to trace it. make th… #749

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 12 additions & 3 deletions ...undation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxTLSBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import org.apache.servicecomb.foundation.ssl.SSLManager;
import org.apache.servicecomb.foundation.ssl.SSLOption;
import org.apache.servicecomb.foundation.ssl.SSLOptionFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import io.vertx.core.http.ClientAuth;
import io.vertx.core.http.HttpClientOptions;
Expand All @@ -34,6 +36,8 @@
import io.vertx.core.net.TCPSSLOptions;

public final class VertxTLSBuilder {
private static final Logger LOGGER = LoggerFactory.getLogger(VertxTLSBuilder.class);

private static final String STORE_PKCS12 = "PKCS12";

private static final String STORE_JKS = "JKS";
Expand Down Expand Up @@ -93,7 +97,8 @@ private static TCPSSLOptions buildTCPSSLOptions(SSLOption sslOption, SSLCustom s
options.setSessionCacheEnabled(true);
tcpClientOptions.setOpenSslEngineOptions(new OpenSSLEngineOptions());
}
if (isFileExists(sslCustom.getFullPath(sslOption.getKeyStore()))) {
String fullKeyStore = sslCustom.getFullPath(sslOption.getKeyStore());
if (isFileExists(fullKeyStore)) {
if (STORE_PKCS12.equalsIgnoreCase(sslOption.getKeyStoreType())) {
PfxOptions keyPfxOptions = new PfxOptions();
keyPfxOptions.setPath(sslCustom.getFullPath(sslOption.getKeyStore()));
Expand All @@ -107,9 +112,11 @@ private static TCPSSLOptions buildTCPSSLOptions(SSLOption sslOption, SSLCustom s
} else {
throw new IllegalArgumentException("invalid key store type.");
}
} else {
LOGGER.warn("keyStore [" + fullKeyStore + "] file not exist, please check!");
}

if (isFileExists(sslCustom.getFullPath(sslOption.getTrustStore()))) {
String fullTrustStore = sslCustom.getFullPath(sslOption.getTrustStore());
if (isFileExists(fullTrustStore)) {
if (STORE_PKCS12.equalsIgnoreCase(sslOption.getTrustStoreType())) {
PfxOptions trustPfxOptions = new PfxOptions();
trustPfxOptions.setPath(sslCustom.getFullPath(sslOption.getTrustStore()));
Expand All @@ -125,6 +132,8 @@ private static TCPSSLOptions buildTCPSSLOptions(SSLOption sslOption, SSLCustom s
} else {
throw new IllegalArgumentException("invalid trust store type.");
}
} else {
LOGGER.warn("trustStore [" + fullTrustStore + "] file not exist, please check!");
}
for (String protocol : sslOption.getProtocols().split(",")) {
tcpClientOptions.addEnabledSecureTransportProtocol(protocol);
Expand Down