aboutsummaryrefslogtreecommitdiffstats
path: root/certService/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'certService/src/test')
-rw-r--r--certService/src/test/java/org/onap/aaf/certservice/certification/CertificationExceptionControllerTest.java (renamed from certService/src/test/java/org/onap/aaf/certservice/certification/exception/CertificationExceptionControllerTest.java)21
-rw-r--r--certService/src/test/java/org/onap/aaf/certservice/certification/CertificationModelFactoryTest.java44
-rw-r--r--certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoaderTest.java4
-rw-r--r--certService/src/test/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProviderTest.java97
-rw-r--r--certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServerConfigurationValidatorTest.java14
-rw-r--r--certService/src/test/java/org/onap/aaf/certservice/certification/model/CsrModelTest.java100
6 files changed, 240 insertions, 40 deletions
diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/exception/CertificationExceptionControllerTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/CertificationExceptionControllerTest.java
index 3dc93035..1a92c0c8 100644
--- a/certService/src/test/java/org/onap/aaf/certservice/certification/exception/CertificationExceptionControllerTest.java
+++ b/certService/src/test/java/org/onap/aaf/certservice/certification/CertificationExceptionControllerTest.java
@@ -18,12 +18,15 @@
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.exception;
+package org.onap.aaf.certservice.certification;
import com.google.gson.Gson;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.certification.CertificationExceptionController;
+import org.onap.aaf.certservice.certification.exception.Cmpv2ServerNotFoundException;
+import org.onap.aaf.certservice.certification.exception.CsrDecryptionException;
+import org.onap.aaf.certservice.certification.exception.ErrorResponseModel;
+import org.onap.aaf.certservice.certification.exception.KeyDecryptionException;
import org.springframework.http.ResponseEntity;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -68,4 +71,18 @@ class CertificationExceptionControllerTest {
assertEquals(expectedMessage, response.getErrorMessage());
}
+ @Test
+ void shouldReturnResponseEntityWithAppropriateErrorMessageWhenGivenCaNameIsNotPresentInConfig() {
+ // given
+ String expectedMessage = "Certification authority not found for given CAName";
+ Cmpv2ServerNotFoundException csrDecryptionException = new Cmpv2ServerNotFoundException("test Ca exception");
+
+ // when
+ ResponseEntity<String> responseEntity = certificationExceptionController.handle(csrDecryptionException);
+
+ ErrorResponseModel response = new Gson().fromJson(responseEntity.getBody(), ErrorResponseModel.class);
+
+ // then
+ assertEquals(expectedMessage, response.getErrorMessage());
+ }
}
diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/CertificationModelFactoryTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/CertificationModelFactoryTest.java
index 2953af78..50e604e2 100644
--- a/certService/src/test/java/org/onap/aaf/certservice/certification/CertificationModelFactoryTest.java
+++ b/certService/src/test/java/org/onap/aaf/certservice/certification/CertificationModelFactoryTest.java
@@ -22,36 +22,52 @@ package org.onap.aaf.certservice.certification;
import org.junit.jupiter.api.BeforeEach;
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.certification.configuration.Cmpv2ServerProvider;
+import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
+import org.onap.aaf.certservice.certification.exception.Cmpv2ServerNotFoundException;
import org.onap.aaf.certservice.certification.model.CertificationModel;
import org.onap.aaf.certservice.certification.model.CsrModel;
+import java.util.Optional;
+
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import static org.onap.aaf.certservice.certification.CertificationData.CA_CERT;
import static org.onap.aaf.certservice.certification.CertificationData.ENTITY_CERT;
import static org.onap.aaf.certservice.certification.CertificationData.INTERMEDIATE_CERT;
import static org.onap.aaf.certservice.certification.CertificationData.EXTRA_CA_CERT;
-
+@ExtendWith(MockitoExtension.class)
class CertificationModelFactoryTest {
+ private static final String TEST_CA = "testCA";
private CertificationModelFactory certificationModelFactory;
+ @Mock
+ Cmpv2ServerProvider cmpv2ServerProvider;
+
@BeforeEach
void setUp() {
- certificationModelFactory = new CertificationModelFactory();
+ certificationModelFactory = new CertificationModelFactory(cmpv2ServerProvider);
}
@Test
void shouldCreateProperCertificationModelWhenGivenProperCsrModelAndCaName() {
// given
- final String testCaName = "testCA";
CsrModel mockedCsrModel = mock(CsrModel.class);
+ when(cmpv2ServerProvider.getCmpv2Server(TEST_CA)).thenReturn(Optional.of(createTestCmpv2Server()));
// when
- CertificationModel certificationModel = certificationModelFactory.createCertificationModel(mockedCsrModel ,testCaName);
+ CertificationModel certificationModel =
+ certificationModelFactory.createCertificationModel(mockedCsrModel ,TEST_CA);
//then
assertEquals(2, certificationModel.getCertificateChain().size());
@@ -60,4 +76,24 @@ class CertificationModelFactoryTest {
assertThat(certificationModel.getTrustedCertificates()).contains(CA_CERT, EXTRA_CA_CERT);
}
+ @Test
+ void shouldThrowCmpv2ServerNotFoundExceptionWhenGivenWrongCaName() {
+ // given
+ String expectedMessage = "CA not found";
+ CsrModel mockedCsrModel = mock(CsrModel.class);
+ when(cmpv2ServerProvider.getCmpv2Server(TEST_CA)).thenThrow(new Cmpv2ServerNotFoundException(expectedMessage));
+
+ // when
+ Exception exception = assertThrows(
+ Cmpv2ServerNotFoundException.class, () ->
+ certificationModelFactory.createCertificationModel(mockedCsrModel ,TEST_CA)
+ );
+
+ // then
+ assertTrue(exception.getMessage().contains(expectedMessage));
+ }
+
+ private Cmpv2Server createTestCmpv2Server() {
+ return new Cmpv2Server();
+ }
}
diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoaderTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoaderTest.java
index b4eec400..cf8c07a1 100644
--- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoaderTest.java
+++ b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoaderTest.java
@@ -88,9 +88,9 @@ class CmpServersConfigLoaderTest {
private void verifyThatCmpServerEquals(Cmpv2Server cmpv2Server, Map<String, String> expected) {
assertThat(cmpv2Server.getCaName()).isEqualTo(expected.get("CA_NAME"));
assertThat(cmpv2Server.getUrl()).isEqualTo(expected.get("URL"));
- assertThat(cmpv2Server.getIssuerDN()).isEqualTo(expected.get("ISSUER_DN"));
+ assertThat(cmpv2Server.getIssuerDN().toString()).isEqualTo(expected.get("ISSUER_DN"));
assertThat(cmpv2Server.getCaMode().name()).isEqualTo(expected.get("CA_MODE"));
assertThat(cmpv2Server.getAuthentication().getIak()).isEqualTo(expected.get("IAK"));
assertThat(cmpv2Server.getAuthentication().getRv()).isEqualTo(expected.get("RV"));
}
-} \ No newline at end of file
+}
diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProviderTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProviderTest.java
new file mode 100644
index 00000000..20a85783
--- /dev/null
+++ b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/Cmpv2ServerProviderTest.java
@@ -0,0 +1,97 @@
+/*
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * 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.certification.configuration;
+
+import org.bouncycastle.asn1.x500.X500Name;
+import org.junit.jupiter.api.BeforeEach;
+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.certification.configuration.model.Authentication;
+import org.onap.aaf.certservice.certification.configuration.model.CaMode;
+import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
+
+import java.util.Collections;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class Cmpv2ServerProviderTest {
+
+ private static final String TEST_CA = "testCA";
+
+ private Cmpv2ServerProvider cmpv2ServerProvider;
+
+ @Mock
+ private CmpServersConfig cmpServersConfig;
+
+ @BeforeEach
+ void setUp() {
+ cmpv2ServerProvider =
+ new Cmpv2ServerProvider(cmpServersConfig);
+ }
+
+ @Test
+ void shouldReturnOptionalWithServerWhenServerWithGivenCaNameIsPresentInConfig() {
+ // given
+ Cmpv2Server testServer = createTestServer();
+ when(cmpServersConfig.getCmpServers()).thenReturn(Collections.singletonList(testServer));
+
+ // when
+ Cmpv2Server receivedServer = cmpv2ServerProvider
+ .getCmpv2Server(TEST_CA)
+ .get();
+
+ // then
+ assertThat(receivedServer).isEqualToComparingFieldByField(testServer);
+ }
+
+
+ @Test
+ void shouldReturnEmptyOptionalWhenServerWithGivenCaNameIsNotPresentInConfig() {
+ // given
+ when(cmpServersConfig.getCmpServers()).thenReturn(Collections.emptyList());
+
+ // when
+ Boolean isEmpty = cmpv2ServerProvider
+ .getCmpv2Server(TEST_CA)
+ .isEmpty();
+
+ // then
+ assertThat(isEmpty).isTrue();
+ }
+
+ private Cmpv2Server createTestServer() {
+ Cmpv2Server testServer = new Cmpv2Server();
+ testServer.setCaName(TEST_CA);
+ testServer.setIssuerDN(new X500Name("CN=testIssuer"));
+ testServer.setUrl("http://test.ca.server");
+ Authentication testAuthentication = new Authentication();
+ testAuthentication.setIak("testIak");
+ testAuthentication.setRv("testRv");
+ testServer.setAuthentication(testAuthentication);
+ testServer.setCaMode(CaMode.RA);
+
+ return testServer;
+ }
+}
diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServerConfigurationValidatorTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServerConfigurationValidatorTest.java
index ea15740c..18097608 100644
--- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServerConfigurationValidatorTest.java
+++ b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServerConfigurationValidatorTest.java
@@ -20,6 +20,7 @@
package org.onap.aaf.certservice.certification.configuration.validation;
+import org.bouncycastle.asn1.x500.X500Name;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -84,15 +85,6 @@ class Cmpv2ServerConfigurationValidatorTest {
}
@Test
- public void givenWrongIssuerDNLengthInURLServerDetailsWhenValidatingShouldThrowException() {
- //given
- server.setIssuerDN("123");
-
- //then
- assertThrows(IllegalArgumentException.class, () -> validator.validate(server));
- }
-
- @Test
public void givenWrongRVLengthInURLServerDetailsWhenValidatingShouldThrowException() {
//given
authentication.setRv("");
@@ -114,7 +106,7 @@ class Cmpv2ServerConfigurationValidatorTest {
server = new Cmpv2Server();
server.setCaMode(CaMode.CLIENT);
server.setCaName("TEST");
- server.setIssuerDN("CN=ManagementCA");
+ server.setIssuerDN(new X500Name("CN=ManagementCA"));
server.setUrl("http://127.0.0.1/ejbca/publicweb/cmp/cmp");
server.setAuthentication(authentication);
}
@@ -124,4 +116,4 @@ class Cmpv2ServerConfigurationValidatorTest {
authentication.setRv("testRV");
authentication.setIak("testIAK");
}
-} \ No newline at end of file
+}
diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/model/CsrModelTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/model/CsrModelTest.java
index bde1dcce..f47f495f 100644
--- a/certService/src/test/java/org/onap/aaf/certservice/certification/model/CsrModelTest.java
+++ b/certService/src/test/java/org/onap/aaf/certservice/certification/model/CsrModelTest.java
@@ -33,14 +33,13 @@ import org.onap.aaf.certservice.certification.exception.KeyDecryptionException;
import java.io.IOException;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.onap.aaf.certservice.certification.TestData.TEST_CSR;
+import static org.onap.aaf.certservice.certification.TestData.TEST_PEM;
import static org.onap.aaf.certservice.certification.TestData.TEST_PK;
-import static org.onap.aaf.certservice.certification.TestUtils.pemObjectToString;
class CsrModelTest {
@@ -52,20 +51,21 @@ class CsrModelTest {
@Test
void shouldByConstructedAndReturnProperFields() throws DecryptionException, IOException {
// given
+ PemObject testPrivateKey = getPemPrivateKey();
PemObject testPublicKey = generateTestPublicKey();
+ PKCS10CertificationRequest testCsr = generateTestCertificationRequest();
// when
- CsrModel csrModel = generateTestCsrModel();
-
+ CsrModel csrModel = generateTestCsrModel(testCsr);
// then
- assertEquals(
- pemObjectToString(csrModel.getPrivateKey()).trim(),
- TEST_PK.trim());
- assertEquals(
- pemObjectToString(csrModel.getPublicKey()).trim(),
- pemObjectToString((testPublicKey)).trim());
- assertThat(csrModel.getSansData())
+ assertThat(csrModel.getCsr())
+ .isEqualTo(testCsr);
+ assertThat(csrModel.getPrivateKey().getEncoded())
+ .contains(testPrivateKey.getContent());
+ assertThat(csrModel.getPublicKey().getEncoded())
+ .contains(testPublicKey.getContent());
+ assertThat(csrModel.getSans())
.contains(
"gerrit.onap.org", "test.onap.org", "onap.com");
assertThat(csrModel.getSubjectData().toString())
@@ -74,24 +74,20 @@ class CsrModelTest {
}
@Test
- void shouldThrowExceptionWhenPublicKeyIsNotCorrect() throws KeyDecryptionException, IOException {
+ void shouldThrowExceptionWhenPublicKeyIsNotCorrect() throws DecryptionException, IOException {
// given
- PemObjectFactory pemObjectFactory = new PemObjectFactory();
+ PemObject testPrivateKey = getPemPrivateKey();
PKCS10CertificationRequest testCsr = mock(PKCS10CertificationRequest.class);
SubjectPublicKeyInfo wrongKryInfo = mock(SubjectPublicKeyInfo.class);
when(testCsr.getSubjectPublicKeyInfo())
.thenReturn(wrongKryInfo);
when(wrongKryInfo.getEncoded())
.thenThrow(new IOException());
- PemObject testPrivateKey = pemObjectFactory.createPemObject(TEST_PK).orElseThrow(
- () -> new KeyDecryptionException("Private key decoding fail")
- );
- CsrModel csrModel = new CsrModel(testCsr, testPrivateKey);
// when
Exception exception = assertThrows(
CsrDecryptionException.class,
- csrModel::getPublicKey
+ () -> new CsrModel.CsrModelBuilder(testCsr, testPrivateKey).build()
);
String expectedMessage = "Reading Public Key from CSR failed";
@@ -101,12 +97,74 @@ class CsrModelTest {
assertTrue(actualMessage.contains(expectedMessage));
}
- private CsrModel generateTestCsrModel() throws DecryptionException {
+ @Test
+ void shouldThrowExceptionWhenPrivateKeyPemIsNotProperPrivateKey() throws KeyDecryptionException, IOException {
+ // given
+ PemObject testPrivateKey = getPemWrongKey();
+ PKCS10CertificationRequest testCsr = mock(PKCS10CertificationRequest.class);
+ SubjectPublicKeyInfo wrongKryInfo = mock(SubjectPublicKeyInfo.class);
+ when(testCsr.getSubjectPublicKeyInfo())
+ .thenReturn(wrongKryInfo);
+ when(wrongKryInfo.getEncoded())
+ .thenThrow(new IOException());
+
+ // when
+ Exception exception = assertThrows(
+ KeyDecryptionException.class,
+ () -> new CsrModel.CsrModelBuilder(testCsr, testPrivateKey).build()
+ );
+
+ String expectedMessage = "Converting Private Key failed";
+ String actualMessage = exception.getMessage();
+
+ // then
+ assertTrue(actualMessage.contains(expectedMessage));
+ }
+
+ @Test
+ void shouldThrowExceptionWhenPublicKeyPemIsNotProperPublicKey() throws KeyDecryptionException, IOException {
+ // given
+ PemObject testPrivateKey = getPemPrivateKey();
+ PemObject testPublicKey = getPemWrongKey();
+ PKCS10CertificationRequest testCsr = mock(PKCS10CertificationRequest.class);
+ SubjectPublicKeyInfo wrongKryInfo = mock(SubjectPublicKeyInfo.class);
+ when(testCsr.getSubjectPublicKeyInfo())
+ .thenReturn(wrongKryInfo);
+ when(wrongKryInfo.getEncoded())
+ .thenReturn(testPublicKey.getContent());
+
+ // when
+ Exception exception = assertThrows(
+ KeyDecryptionException.class,
+ () -> new CsrModel.CsrModelBuilder(testCsr, testPrivateKey).build()
+ );
+
+ String expectedMessage = "Converting Public Key from CSR failed";
+ String actualMessage = exception.getMessage();
+
+ // then
+ assertTrue(actualMessage.contains(expectedMessage));
+ }
+
+ private PemObject getPemPrivateKey() throws KeyDecryptionException {
+ PemObjectFactory pemObjectFactory = new PemObjectFactory();
+ return pemObjectFactory.createPemObject(TEST_PK).orElseThrow(
+ () -> new KeyDecryptionException("Private key decoding fail")
+ );
+ }
+
+ private PemObject getPemWrongKey() throws KeyDecryptionException {
+ PemObjectFactory pemObjectFactory = new PemObjectFactory();
+ return pemObjectFactory.createPemObject(TEST_PEM).orElseThrow(
+ () -> new KeyDecryptionException("Private key decoding fail")
+ );
+ }
+
+ private CsrModel generateTestCsrModel(PKCS10CertificationRequest testCsr) throws DecryptionException {
PemObject testPrivateKey = pemObjectFactory.createPemObject(TEST_PK).orElseThrow(
() -> new DecryptionException("Incorrect Private Key, decryption failed")
);
- PKCS10CertificationRequest testCsr = generateTestCertificationRequest();
- return new CsrModel(testCsr, testPrivateKey);
+ return new CsrModel.CsrModelBuilder(testCsr, testPrivateKey).build();
}
private PemObject generateTestPublicKey() throws DecryptionException, IOException {