Switch client and server to communicate over TLS

Issue-ID: AAF-1084
Signed-off-by: Adam Wudziński <adam.wudzinski@nokia.com>
Change-Id: I7f11b27c7dcdf4fc3eba2d5e64b6dc775c80dd74

3 files changed, 200 insertions, 3 deletions

diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/SslContextFactoryTest.java b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/SslContextFactoryTest.java
new file mode 100644
index 00000000..e71e9895
--- /dev/null
+++ b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/SslContextFactoryTest.java
@@ -0,0 +1,197 @@
+/*
+ * ============LICENSE_START=======================================================
+ * aaf-certservice-client
+ * ================================================================================
+ * Copyright (C) 2020 Nokia. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.aaf.certservice.client.configuration.factory;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.onap.aaf.certservice.client.configuration.EnvsForTls;
+import org.onap.aaf.certservice.client.configuration.exception.TlsConfigurationException;
+
+import javax.net.ssl.SSLContext;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.when;
+
+
+@ExtendWith(MockitoExtension.class)
+public class SslContextFactoryTest {
+
+    public static final String INVALID_KEYSTORE_PATH = "nonexistent/keystore";
+    public static final String VALID_KEYSTORE_NAME = "keystore.jks";
+    public static final String VALID_KEYSTORE_PASSWORD = "secret";
+    public static final String INVALID_KEYSTORE_PASSWORD = "wrong_secret";
+    public static final String INVALID_TRUSTSTORE_PATH = "nonexistent/truststore";
+    public static final String VALID_TRUSTSTORE_PASSWORD = "secret";
+    public static final String INVALID_TRUSTSTORE_PASSWORD = "wrong_secret";
+    public static final String VALID_TRUSTSTORE_NAME = "truststore.jks";
+    @Mock
+    private EnvsForTls envsForTls;
+
+    @Test
+    public void shouldThrowExceptionWhenKeystorePathEnvIsMissing() {
+        // Given
+        when(envsForTls.getKeystorePath()).thenReturn(Optional.empty());
+        SslContextFactory sslContextFactory = new SslContextFactory(envsForTls);
+
+        // When, Then
+        Exception exception = assertThrows(
+                TlsConfigurationException.class, sslContextFactory::create
+        );
+        assertThat(exception.getMessage()).contains("KEYSTORE_PATH");
+    }
+
+    @Test
+    public void shouldThrowExceptionWhenKeystorePasswordEnvIsMissing() {
+        // Given
+        when(envsForTls.getKeystorePath()).thenReturn(Optional.of("keystore"));
+        when(envsForTls.getKeystorePassword()).thenReturn(Optional.empty());
+        SslContextFactory sslContextFactory = new SslContextFactory(envsForTls);
+
+        // When, Then
+        Exception exception = assertThrows(
+                TlsConfigurationException.class, sslContextFactory::create
+        );
+        assertThat(exception.getMessage()).contains("KEYSTORE_PASSWORD");
+    }
+
+    @Test
+    public void shouldThrowExceptionWhenTruststorePathEnvIsMissing() {
+        // Given
+        when(envsForTls.getKeystorePath()).thenReturn(Optional.of("keystore"));
+        when(envsForTls.getKeystorePassword()).thenReturn(Optional.of("password"));
+        when(envsForTls.getTruststorePath()).thenReturn(Optional.empty());
+        SslContextFactory sslContextFactory = new SslContextFactory(envsForTls);
+
+        // When, Then
+        Exception exception = assertThrows(
+                TlsConfigurationException.class, sslContextFactory::create
+        );
+        assertThat(exception.getMessage()).contains("TRUSTSTORE_PATH");
+    }
+
+    @Test
+    public void shouldThrowExceptionWhenTruststorePasswordEnvIsMissing() {
+        // Given
+        when(envsForTls.getKeystorePath()).thenReturn(Optional.of("keystore"));
+        when(envsForTls.getKeystorePassword()).thenReturn(Optional.of("password"));
+        when(envsForTls.getTruststorePath()).thenReturn(Optional.of("truststore"));
+        when(envsForTls.getTruststorePassword()).thenReturn(Optional.empty());
+        SslContextFactory sslContextFactory = new SslContextFactory(envsForTls);
+
+        // When, Then
+        Exception exception = assertThrows(
+                TlsConfigurationException.class, sslContextFactory::create
+        );
+        assertThat(exception.getMessage()).contains("TRUSTSTORE_PASSWORD");
+    }
+
+    @Test
+    public void shouldThrowExceptionWhenKeystoreIsMissing() {
+        // Given
+        when(envsForTls.getKeystorePath()).thenReturn(Optional.of(INVALID_KEYSTORE_PATH));
+        when(envsForTls.getKeystorePassword()).thenReturn(Optional.of("secret"));
+        when(envsForTls.getTruststorePath()).thenReturn(Optional.of("truststore.jks"));
+        when(envsForTls.getTruststorePassword()).thenReturn(Optional.of("secret"));
+        SslContextFactory sslContextFactory = new SslContextFactory(envsForTls);
+
+        // When, Then
+        assertThrows(
+                TlsConfigurationException.class, sslContextFactory::create
+        );
+    }
+
+    @Test
+    public void shouldThrowExceptionWhenKeystorePasswordIsWrong() {
+        // Given
+        String keystorePath = getResourcePath(VALID_KEYSTORE_NAME);
+        when(envsForTls.getKeystorePath()).thenReturn(Optional.of(keystorePath));
+        when(envsForTls.getKeystorePassword()).thenReturn(Optional.of(INVALID_KEYSTORE_PASSWORD));
+        when(envsForTls.getTruststorePath()).thenReturn(Optional.of(VALID_TRUSTSTORE_NAME));
+        when(envsForTls.getTruststorePassword()).thenReturn(Optional.of(VALID_TRUSTSTORE_PASSWORD));
+        SslContextFactory sslContextFactory = new SslContextFactory(envsForTls);
+
+        // When, Then
+        assertThrows(
+                TlsConfigurationException.class, sslContextFactory::create
+        );
+    }
+
+    @Test
+    public void shouldThrowExceptionWhenTruststoreIsMissing() {
+        // Given
+        String keystorePath = getResourcePath(VALID_KEYSTORE_NAME);
+        when(envsForTls.getKeystorePath()).thenReturn(Optional.of(keystorePath));
+        when(envsForTls.getKeystorePassword()).thenReturn(Optional.of(VALID_KEYSTORE_PASSWORD));
+        when(envsForTls.getTruststorePath()).thenReturn(Optional.of(INVALID_TRUSTSTORE_PATH));
+        when(envsForTls.getTruststorePassword()).thenReturn(Optional.of(VALID_TRUSTSTORE_PASSWORD));
+        SslContextFactory sslContextFactory = new SslContextFactory(envsForTls);
+
+        // When, Then
+        assertThrows(
+                TlsConfigurationException.class, sslContextFactory::create
+        );
+    }
+
+    @Test
+    public void shouldThrowExceptionWhenTruststorePasswordIsWrong() {
+        // Given
+        String keystorePath = getResourcePath(VALID_KEYSTORE_NAME);
+        String truststorePath = getResourcePath(VALID_TRUSTSTORE_NAME);
+        when(envsForTls.getKeystorePath()).thenReturn(Optional.of(keystorePath));
+        when(envsForTls.getKeystorePassword()).thenReturn(Optional.of(VALID_KEYSTORE_PASSWORD));
+        when(envsForTls.getTruststorePath()).thenReturn(Optional.of(truststorePath));
+        when(envsForTls.getTruststorePassword()).thenReturn(Optional.of(INVALID_TRUSTSTORE_PASSWORD));
+        SslContextFactory sslContextFactory = new SslContextFactory(envsForTls);
+
+        // When, Then
+        assertThrows(
+                TlsConfigurationException.class, sslContextFactory::create
+        );
+    }
+
+    @Test
+    public void shouldReturnSSLContext() throws TlsConfigurationException {
+        // Given
+        String keystorePath = getResourcePath(VALID_KEYSTORE_NAME);
+        String truststorePath = getResourcePath(VALID_TRUSTSTORE_NAME);
+        when(envsForTls.getKeystorePath()).thenReturn(Optional.of(keystorePath));
+        when(envsForTls.getKeystorePassword()).thenReturn(Optional.of(VALID_KEYSTORE_PASSWORD));
+        when(envsForTls.getTruststorePath()).thenReturn(Optional.of(truststorePath));
+        when(envsForTls.getTruststorePassword()).thenReturn(Optional.of(VALID_TRUSTSTORE_PASSWORD));
+        SslContextFactory sslContextFactory = new SslContextFactory(envsForTls);
+
+        // When
+        SSLContext sslContext = sslContextFactory.create();
+
+        // Then
+        assertNotNull(sslContext);
+    }
+
+    private String getResourcePath(String resource) {
+        return getClass().getClassLoader().getResource(resource).getFile();
+    }
+}
+
diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/model/ClientConfigurationFactoryTest.java b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/model/ClientConfigurationFactoryTest.java
index c936ef52..f4f92495 100644
--- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/model/ClientConfigurationFactoryTest.java
+++ b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/model/ClientConfigurationFactoryTest.java
@@ -38,8 +38,8 @@ public class ClientConfigurationFactoryTest {
     private final String CA_NAME_VALID =  "caaaftest2";
     private final String TIME_OUT_VALID = "30000";
     private final String OUTPUT_PATH_VALID = "/opt/app/osaaf";
-    private final String URL_TO_CERT_SERVICE_VALID = "http://cert-service:8080/v1/certificate/";
-    private final String URL_TO_CERT_SERVICE_DEFAULT = "http://aaf-cert-service-service:8080/v1/certificate/";
+    private final String URL_TO_CERT_SERVICE_VALID = "https://cert-service:8443/v1/certificate/";
+    private final String URL_TO_CERT_SERVICE_DEFAULT = "https://aaf-cert-service:8443/v1/certificate/";
     private final String CA_NAME_INVALID =  "caaaftest2#$";
     private final String OUTPUT_PATH_INVALID = "/opt//app/osaaf";
 
diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/httpclient/HttpClientTest.java b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/httpclient/HttpClientTest.java
index 2a539414..60c2e93d 100644
--- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/httpclient/HttpClientTest.java
+++ b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/httpclient/HttpClientTest.java
@@ -66,7 +66,7 @@ class HttpClientTest {
         statusLine = mock(StatusLine.class);
         httpResponse = mock(CloseableHttpResponse.class);
 
-        CloseableHttpClientProvider httpClientProvider = mock(CloseableHttpClientProvider.class);
+        CloseableHttpsClientProvider httpClientProvider = mock(CloseableHttpsClientProvider.class);
 
         when(httpClientProvider.getClient()).thenReturn(closeableHttpClient);
         String testCertServiceAddress = "";