aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/org/onap/dcae/common/SSLContextCreator.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/onap/dcae/common/SSLContextCreator.java')
-rw-r--r--src/main/java/org/onap/dcae/common/SSLContextCreator.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/org/onap/dcae/common/SSLContextCreator.java b/src/main/java/org/onap/dcae/common/SSLContextCreator.java
index a76c7cbe..898e5d55 100644
--- a/src/main/java/org/onap/dcae/common/SSLContextCreator.java
+++ b/src/main/java/org/onap/dcae/common/SSLContextCreator.java
@@ -20,9 +20,9 @@
package org.onap.dcae.common;
-import org.springframework.boot.web.server.Ssl;
-
import java.nio.file.Path;
+import org.springframework.boot.web.server.Ssl;
+import org.springframework.boot.web.server.Ssl.ClientAuth;
public class SSLContextCreator {
private final String keyStorePassword;
@@ -32,6 +32,7 @@ public class SSLContextCreator {
private Path trustStoreFile;
private String trustStorePassword;
private boolean hasTlsClientAuthentication = false;
+ private ClientAuth clientAuth;
public static SSLContextCreator create(final Path keyStoreFile, final String certAlias, final String password) {
return new SSLContextCreator(keyStoreFile, certAlias, password);
@@ -43,8 +44,9 @@ public class SSLContextCreator {
this.keyStorePassword = password;
}
- public SSLContextCreator withTlsClientAuthentication(final Path trustStoreFile, final String password) {
- hasTlsClientAuthentication = true;
+ public SSLContextCreator withTlsClientAuthentication(final Path trustStoreFile, final String password, final ClientAuth clientAuth) {
+ this.clientAuth = clientAuth;
+ this.hasTlsClientAuthentication = true;
this.trustStoreFile = trustStoreFile;
this.trustStorePassword = password;
@@ -53,7 +55,6 @@ public class SSLContextCreator {
private void configureKeyStore(final Ssl ssl) {
final String keyStore = keyStoreFile.toAbsolutePath().toString();
-
ssl.setKeyStore(keyStore);
ssl.setKeyPassword(keyStorePassword);
ssl.setKeyAlias(certAlias);
@@ -64,7 +65,7 @@ public class SSLContextCreator {
ssl.setTrustStore(trustStore);
ssl.setTrustStorePassword(trustStorePassword);
- ssl.setClientAuth(Ssl.ClientAuth.NEED);
+ ssl.setClientAuth(clientAuth);
}
public Ssl build() {
@@ -76,7 +77,6 @@ public class SSLContextCreator {
if (hasTlsClientAuthentication) {
configureTrustStore(ssl);
}
-
return ssl;
}
} \ No newline at end of file