Collector authentication enhancement

Collector authentication enhancement

Change-Id: I03a05cb83dd8c498fb218e82e9b3958348fbb4ac
Issue-ID: DCAEGEN2-1101
Signed-off-by: Zlatko Murgoski <zlatko.murgoski@nokia.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/src/main/java/org/onap/dcae/common/SSLContextCreator.java b/src/main/java/org/onap/dcae/common/SSLContextCreator.java
index e636f4c0..898e5d55 100644
--- a/src/main/java/org/onap/dcae/common/SSLContextCreator.java
+++ b/src/main/java/org/onap/dcae/common/SSLContextCreator.java
@@ -22,6 +22,7 @@ package org.onap.dcae.common;
 
 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;
@@ -31,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);
@@ -42,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;
 
@@ -62,7 +65,7 @@ public class SSLContextCreator {
 
         ssl.setTrustStore(trustStore);
         ssl.setTrustStorePassword(trustStorePassword);
-        ssl.setClientAuth(Ssl.ClientAuth.NEED);
+        ssl.setClientAuth(clientAuth);
     }
 
     public Ssl build() {
@@ -74,7 +77,6 @@ public class SSLContextCreator {
         if (hasTlsClientAuthentication) {
             configureTrustStore(ssl);
         }
-
         return ssl;
     }
 }
\ No newline at end of file