Add validation for OUTPUT_TYPE parameter

Issue-ID: AAF-1152

Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
Change-Id: Iec46b8a7b8e1818b62877f5272368636dc1929a0

3 files changed, 352 insertions, 1 deletions

diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactoryTest.java b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactoryTest.java
index c5955555..6273e2a6 100644
--- a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactoryTest.java
+++ b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactoryTest.java
@@ -28,7 +28,7 @@ import static org.mockito.Mockito.mock;
 
 public class AbstractConfigurationFactoryTest {
 
-    private AbstractConfigurationFactory cut = mock(AbstractConfigurationFactory.class, Mockito.CALLS_REAL_METHODS);
+    private final AbstractConfigurationFactory cut = mock(AbstractConfigurationFactory.class, Mockito.CALLS_REAL_METHODS);
 
     @ParameterizedTest
     @ValueSource(strings = {"/var/log", "/", "/var/log/", "/second_var", "/second-var"})
@@ -77,4 +77,16 @@ public class AbstractConfigurationFactoryTest {
     public void shouldRejectInvalidCommonName(String commonName) {
         assertThat(cut.isCommonNameValid(commonName)).isFalse();
     }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"JKS", "P12", "PEM"})
+    public void shouldAcceptValidOutputType(String outputType) {
+        assertThat(cut.isOutputTypeValid(outputType)).isTrue();
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"jks", "p12", "pem", "", "pass", "!@$#pp"})
+    public void shouldRejectInvalidOutputType(String outputType) {
+        assertThat(cut.isOutputTypeValid(outputType)).isFalse();
+    }
 }
diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactoryTest.java b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactoryTest.java
new file mode 100644
index 00000000..bf4bc3db
--- /dev/null
+++ b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/ClientConfigurationFactoryTest.java
@@ -0,0 +1,153 @@
+/*
+ * ============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.onap.aaf.certservice.client.configuration.ClientConfigurationEnvs;
+import org.onap.aaf.certservice.client.configuration.EnvsForClient;
+import org.onap.aaf.certservice.client.configuration.exception.ClientConfigurationException;
+import org.onap.aaf.certservice.client.configuration.model.ClientConfiguration;
+
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+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 = "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";
+    private final String OUTPUT_TYPE_VALID = "JKS";
+    private final String OUTPUT_TYPE_INVALID = "JKSS";
+
+    private EnvsForClient envsForClient = mock(EnvsForClient.class);
+
+
+    @Test
+    void create_shouldReturnSuccessWhenAllVariablesAreSetAndValid() throws ClientConfigurationException {
+        // given
+        when(envsForClient.getCaName()).thenReturn(Optional.of(CA_NAME_VALID));
+        when(envsForClient.getOutputPath()).thenReturn(Optional.of(OUTPUT_PATH_VALID));
+        when(envsForClient.getRequestTimeOut()).thenReturn(Optional.of(TIME_OUT_VALID));
+        when(envsForClient.getUrlToCertService()).thenReturn(Optional.of(URL_TO_CERT_SERVICE_VALID));
+        when(envsForClient.getOutputType()).thenReturn(Optional.of(OUTPUT_TYPE_VALID));
+
+        // when
+        ClientConfiguration configuration = new ClientConfigurationFactory(envsForClient).create();
+        System.out.println(configuration.toString());
+
+        // then
+        assertThat(configuration.getCaName()).isEqualTo(CA_NAME_VALID);
+        assertThat(configuration.getRequestTimeout()).isEqualTo(Integer.valueOf(TIME_OUT_VALID));
+        assertThat(configuration.getCertsOutputPath()).isEqualTo(OUTPUT_PATH_VALID);
+        assertThat(configuration.getUrlToCertService()).isEqualTo(URL_TO_CERT_SERVICE_VALID);
+        assertThat(configuration.getOutputType()).isEqualTo(OUTPUT_TYPE_VALID);
+    }
+
+    @Test
+    void create_shouldReturnSuccessWhenDefaultVariablesAreNotSet() throws ClientConfigurationException {
+        // given
+        when(envsForClient.getCaName()).thenReturn(Optional.of(CA_NAME_VALID));
+        when(envsForClient.getOutputPath()).thenReturn(Optional.of(OUTPUT_PATH_VALID));
+
+        // when
+        ClientConfiguration configuration = new ClientConfigurationFactory(envsForClient).create();
+
+        // then
+        assertThat(configuration.getCaName()).isEqualTo(CA_NAME_VALID);
+        assertThat(configuration.getRequestTimeout()).isEqualTo(Integer.valueOf(TIME_OUT_VALID));
+        assertThat(configuration.getCertsOutputPath()).isEqualTo(OUTPUT_PATH_VALID);
+        assertThat(configuration.getUrlToCertService()).isEqualTo(URL_TO_CERT_SERVICE_DEFAULT);
+    }
+
+    @Test
+    void create_shouldReturnClientExceptionWhenRequiredVariableIsNotSet() {
+        // given
+        when(envsForClient.getOutputPath()).thenReturn(Optional.of(OUTPUT_PATH_VALID));
+
+        // when
+        ClientConfigurationFactory configurationFactory = new ClientConfigurationFactory(envsForClient);
+
+        // then
+        assertThatExceptionOfType(ClientConfigurationException.class)
+                .isThrownBy(configurationFactory::create)
+                .withMessageContaining(ClientConfigurationEnvs.CA_NAME + " is invalid.");
+    }
+
+    @Test
+    void create_shouldReturnClientExceptionWhenCANameContainsSpecialCharacters() {
+        // given
+        when(envsForClient.getCaName()).thenReturn(Optional.of(CA_NAME_INVALID));
+        when(envsForClient.getOutputPath()).thenReturn(Optional.of(OUTPUT_PATH_VALID));
+        when(envsForClient.getRequestTimeOut()).thenReturn(Optional.of(TIME_OUT_VALID));
+        when(envsForClient.getUrlToCertService()).thenReturn(Optional.of(URL_TO_CERT_SERVICE_VALID));
+
+        // when
+        ClientConfigurationFactory configurationFactory = new ClientConfigurationFactory(envsForClient);
+
+        // when/then
+        assertThatExceptionOfType(ClientConfigurationException.class)
+                .isThrownBy(configurationFactory::create)
+                .withMessageContaining(ClientConfigurationEnvs.CA_NAME + " is invalid.");
+    }
+
+    @Test
+    void create_shouldReturnClientExceptionWhenOutputPathContainsSpecialCharacters() {
+        // given
+        when(envsForClient.getCaName()).thenReturn(Optional.of(CA_NAME_VALID));
+        when(envsForClient.getOutputPath()).thenReturn(Optional.of(OUTPUT_PATH_INVALID));
+        when(envsForClient.getRequestTimeOut()).thenReturn(Optional.of(TIME_OUT_VALID));
+        when(envsForClient.getUrlToCertService()).thenReturn(Optional.of(URL_TO_CERT_SERVICE_VALID));
+
+        // when
+        ClientConfigurationFactory configurationFactory = new ClientConfigurationFactory(envsForClient);
+
+        //then
+        assertThatExceptionOfType(ClientConfigurationException.class)
+                .isThrownBy(configurationFactory::create)
+                .withMessageContaining(ClientConfigurationEnvs.OUTPUT_PATH + " is invalid.");
+    }
+
+    @Test
+    void create_shouldReturnClientExceptionWhenOutputTypeIsInvalid() {
+        // given
+        when(envsForClient.getCaName()).thenReturn(Optional.of(CA_NAME_VALID));
+        when(envsForClient.getOutputPath()).thenReturn(Optional.of(OUTPUT_PATH_VALID));
+        when(envsForClient.getRequestTimeOut()).thenReturn(Optional.of(TIME_OUT_VALID));
+        when(envsForClient.getUrlToCertService()).thenReturn(Optional.of(URL_TO_CERT_SERVICE_VALID));
+        when(envsForClient.getOutputType()).thenReturn(Optional.of(OUTPUT_TYPE_INVALID));
+
+        // when
+        ClientConfigurationFactory configurationFactory = new ClientConfigurationFactory(envsForClient);
+
+        //then
+        assertThatExceptionOfType(ClientConfigurationException.class)
+                .isThrownBy(configurationFactory::create)
+                .withMessageContaining(ClientConfigurationEnvs.OUTPUT_TYPE + " is invalid.");
+    }
+}
diff --git a/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/CsrConfigurationFactoryTest.java b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/CsrConfigurationFactoryTest.java
new file mode 100644
index 00000000..2edff2f1
--- /dev/null
+++ b/certServiceClient/src/test/java/org/onap/aaf/certservice/client/configuration/factory/CsrConfigurationFactoryTest.java
@@ -0,0 +1,186 @@
+/*
+ * ============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.assertj.core.api.Condition;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.onap.aaf.certservice.client.configuration.CsrConfigurationEnvs;
+import org.onap.aaf.certservice.client.configuration.EnvsForCsr;
+import org.onap.aaf.certservice.client.configuration.exception.CsrConfigurationException;
+import org.onap.aaf.certservice.client.configuration.model.CsrConfiguration;
+
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.onap.aaf.certservice.client.api.ExitStatus.CSR_CONFIGURATION_EXCEPTION;
+
+public class CsrConfigurationFactoryTest {
+
+    private final String COMMON_NAME_VALID = "onap.org";
+    private final String SANS_VALID = "test-name";
+    private final String COUNTRY_VALID = "US";
+    private final String LOCATION_VALID = "San-Francisco";
+    private final String ORGANIZATION_VALID =  "Linux-Foundation";
+    private final String ORGANIZATION_UNIT_VALID = "ONAP";
+    private final String STATE_VALID = "California";
+    private final String COMMON_NAME_INVALID = "onap.org*&";
+    private final String COUNTRY_INVALID = "PLA";
+    private final String ORGANIZATION_INVALID = "Linux?Foundation";
+
+    private EnvsForCsr envsForCsr = mock(EnvsForCsr.class);
+    private CsrConfigurationFactory testedFactory;
+    private Condition<CsrConfigurationException> expectedExitCodeCondition = new Condition<>("Correct exit code"){
+        @Override
+        public boolean matches(CsrConfigurationException e) {
+            return e.applicationExitStatus() == CSR_CONFIGURATION_EXCEPTION;
+        }
+    };
+
+    @BeforeEach
+    void setUp() {
+        testedFactory = new CsrConfigurationFactory(envsForCsr);
+    }
+
+    @Test
+    void shouldReturnCorrectConfiguration_WhenAllVariablesAreSetAndValid() throws CsrConfigurationException {
+        // given
+        mockEnvsWithAllValidParameters();
+
+        // when
+        CsrConfiguration configuration = testedFactory.create();
+
+        // then
+        assertThat(configuration.getCommonName()).isEqualTo(COMMON_NAME_VALID);
+        assertThat(configuration.getSans()).isEqualTo(SANS_VALID);
+        assertThat(configuration.getCountry()).isEqualTo(COUNTRY_VALID);
+        assertThat(configuration.getLocation()).isEqualTo(LOCATION_VALID);
+        assertThat(configuration.getOrganization()).isEqualTo(ORGANIZATION_VALID);
+        assertThat(configuration.getOrganizationUnit()).isEqualTo(ORGANIZATION_UNIT_VALID);
+        assertThat(configuration.getState()).isEqualTo(STATE_VALID);
+    }
+
+    @Test
+    void shouldReturnCorrectConfiguration_WhenNotRequiredVariablesAreNotSet() throws CsrConfigurationException {
+        // given
+        mockEnvsWithValidRequiredParameters();
+
+        // when
+        CsrConfiguration configuration = testedFactory.create();
+
+        // then
+        assertThat(configuration.getCommonName()).isEqualTo(COMMON_NAME_VALID);
+        assertThat(configuration.getCountry()).isEqualTo(COUNTRY_VALID);
+        assertThat(configuration.getOrganization()).isEqualTo(ORGANIZATION_VALID);
+        assertThat(configuration.getState()).isEqualTo(STATE_VALID);
+    }
+
+
+    @Test
+    void shouldThrowCsrConfigurationException_WhenCommonNameInvalid() {
+        // given
+        mockEnvsWithInvalidCommonName();
+
+        // when/then
+        assertThatExceptionOfType(CsrConfigurationException.class)
+                .isThrownBy(testedFactory::create)
+                .withMessageContaining(CsrConfigurationEnvs.COMMON_NAME + " is invalid.")
+                .has(expectedExitCodeCondition);
+    }
+
+    @Test
+    void shouldThrowCsrConfigurationException_WhenOrganizationInvalid() {
+        // given
+        mockEnvsWithInvalidOrganization();
+
+        // when/then
+        assertThatExceptionOfType(CsrConfigurationException.class)
+                .isThrownBy(testedFactory::create)
+                .withMessageContaining(CsrConfigurationEnvs.ORGANIZATION + " is invalid.")
+                .has(expectedExitCodeCondition);
+
+    }
+
+    @Test
+    void shouldThrowCsrConfigurationException_WhenCountryInvalid() {
+        // given
+        mockEnvsWithInvalidCountry();
+
+        // when/then
+        assertThatExceptionOfType(CsrConfigurationException.class)
+                .isThrownBy(testedFactory::create)
+                .withMessageContaining(CsrConfigurationEnvs.COUNTRY + " is invalid.")
+                .has(expectedExitCodeCondition);
+
+    }
+
+    @Test
+    void shouldThrowCsrConfigurationExceptionWhenStateInvalid() {
+        // given
+        mockEnvsWithInvalidState();
+        // when/then
+        assertThatExceptionOfType(CsrConfigurationException.class)
+                .isThrownBy(testedFactory::create)
+                .withMessageContaining(CsrConfigurationEnvs.STATE + " is invalid.")
+                .has(expectedExitCodeCondition);
+    }
+
+    private void mockEnvsWithAllValidParameters() {
+        mockEnvsWithValidRequiredParameters();
+        mockEnvsWithValidOptionalParameters();
+    }
+
+    private void mockEnvsWithValidOptionalParameters() {
+        when(envsForCsr.getOrganizationUnit()).thenReturn(Optional.of(ORGANIZATION_UNIT_VALID));
+        when(envsForCsr.getLocation()).thenReturn(Optional.of(LOCATION_VALID));
+        when(envsForCsr.getSubjectAlternativesName()).thenReturn(Optional.of(SANS_VALID));
+    }
+
+    private void mockEnvsWithValidRequiredParameters() {
+        when(envsForCsr.getCommonName()).thenReturn(Optional.of(COMMON_NAME_VALID));
+        when(envsForCsr.getCountry()).thenReturn(Optional.of(COUNTRY_VALID));
+        when(envsForCsr.getOrganization()).thenReturn(Optional.of(ORGANIZATION_VALID));
+        when(envsForCsr.getState()).thenReturn(Optional.of(STATE_VALID));
+    }
+
+    private void mockEnvsWithInvalidCommonName() {
+        mockEnvsWithAllValidParameters();
+        when(envsForCsr.getCommonName()).thenReturn(Optional.of(COMMON_NAME_INVALID));
+    }
+
+    private void mockEnvsWithInvalidCountry() {
+        mockEnvsWithAllValidParameters();
+        when(envsForCsr.getCountry()).thenReturn(Optional.of(COUNTRY_INVALID));
+    }
+
+    private void mockEnvsWithInvalidOrganization() {
+        mockEnvsWithAllValidParameters();
+        when(envsForCsr.getOrganization()).thenReturn(Optional.of(ORGANIZATION_INVALID));
+    }
+
+    private void mockEnvsWithInvalidState() {
+        mockEnvsWithAllValidParameters();
+        when(envsForCsr.getState()).thenReturn(Optional.empty());
+    }
+}