* ============LICENSE_START=======================================================
* PROJECT
* ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
+ * Copyright (C) 2020-2021 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.
@Parameter(description = "Private key in form of PEM object encoded in Base64 (with header and footer).")
@RequestHeader("PK") String encodedPrivateKey
) throws DecryptionException, CmpClientException {
- caName = caName.replaceAll("[\n|\r|\t]", "_");
+ caName = caName.replaceAll("[\n\r\t]", "_");
LOGGER.info("Received certificate signing request for CA named: {}", caName);
CertificationModel certificationModel = certificationModelFactory
.createCertificationModel(encodedCsr, encodedPrivateKey, caName);
}
private void logServerResponse(CertResponse certResponse) {
- LOG.info("Response status code: {}", certResponse.getStatus().getStatus().toString());
+ if (LOG.isInfoEnabled()) {
+ LOG.info("Response status code: {}", certResponse.getStatus().getStatus());
+ }
if (certResponse.getStatus().getStatusString() != null) {
String serverMessage = certResponse.getStatus().getStatusString().getStringAt(0).getString();
LOG.warn("Response status text: {}", serverMessage);
}
- if (certResponse.getStatus().getFailInfo() != null) {
- LOG.warn("Response fail info: {}", certResponse.getStatus().getFailInfo().toString());
+ if (LOG.isWarnEnabled() && certResponse.getStatus().getFailInfo() != null) {
+ LOG.warn("Response fail info: {}", certResponse.getStatus().getFailInfo());
}
}
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.security.InvalidKeyException;
-import java.security.Key;
import java.security.KeyPair;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
* ============LICENSE_START=======================================================
* PROJECT
* ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
+ * Copyright (C) 2020-2021 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.
import org.springframework.http.ResponseEntity;
@ExtendWith(MockitoExtension.class)
-public class ReloadConfigControllerTest {
+class ReloadConfigControllerTest {
private static final String ERROR_MESSAGE = "Exception occurred during CMP Servers configuration loading";
* ============LICENSE_START=======================================================
* PROJECT
* ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
+ * Copyright (C) 2020-2021 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.
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.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.onap.oom.certservice.certification.CertificationData.CA_CERT;
String expectedMessage = "Incorrect CSR, decryption failed";
when(
csrModelFactory.createCsrModel(
- eq(new CsrModelFactory.StringBase64(ENCODED_WRONG_CSR)),
- eq(new CsrModelFactory.StringBase64(ENCODED_WRONG_PK))
+ new CsrModelFactory.StringBase64(ENCODED_WRONG_CSR),
+ new CsrModelFactory.StringBase64(ENCODED_WRONG_PK)
)
).thenThrow(
new CsrDecryptionException(expectedMessage)
CsrModel csrModel = mockCsrFactoryModelCreation();
Cmpv2Server testServer = mockCmpv2ProviderServerSelection();
when(
- certificationProvider.signCsr(eq(csrModel), eq(testServer))
+ certificationProvider.signCsr(csrModel, testServer)
).thenThrow(
new CmpClientException(expectedMessage)
);
throws CmpClientException, Cmpv2ClientAdapterException {
CertificationModel expectedCertificationModel = getCertificationModel();
when(
- certificationProvider.signCsr(eq(csrModel), eq(testServer))
+ certificationProvider.signCsr(csrModel, testServer)
).thenReturn(expectedCertificationModel);
}
private Cmpv2Server mockCmpv2ProviderServerSelection() {
Cmpv2Server testServer = getCmpv2Server();
when(
- cmpv2ServerProvider.getCmpv2Server(eq(TEST_CA))
+ cmpv2ServerProvider.getCmpv2Server(TEST_CA)
).thenReturn(testServer);
return testServer;
}
CsrModel csrModel = getCsrModel();
when(
csrModelFactory.createCsrModel(
- eq(new CsrModelFactory.StringBase64(ENCODED_CSR)),
- eq(new CsrModelFactory.StringBase64(ENCODED_PK))
+ new CsrModelFactory.StringBase64(ENCODED_CSR),
+ new CsrModelFactory.StringBase64(ENCODED_PK)
)
).thenReturn(csrModel);
return csrModel;
* ============LICENSE_START=======================================================
* PROJECT
* ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
+ * Copyright (C) 2020-2021 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.
List<Cmpv2Server> cmpServers = configLoader.load(path);
// Then
- assertThat(cmpServers).isNotNull();
- assertThat(cmpServers).hasSize(2);
+ assertThat(cmpServers)
+ .isNotNull()
+ .hasSize(2);
verifyThatCmpServerEquals(cmpServers.get(0), EXPECTED_FIRST_CMP_SERVER);
verifyThatCmpServerEquals(cmpServers.get(1), EXPECTED_SECOND_CMP_SERVER);
}
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().toString()).isEqualTo(expected.get("ISSUER_DN"));
+ assertThat(cmpv2Server.getIssuerDN()).hasToString(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"));
import java.security.spec.X509EncodedKeySpec;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Collections;
import java.util.Date;
-import java.util.List;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpEntity;
import org.junit.jupiter.api.Test;
import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
-public class CmpMessageHelperTest {
+class CmpMessageHelperTest {
private final KeyUsage expectedKeyUsage = new KeyUsage(
KeyUsage.digitalSignature | KeyUsage.keyEncipherment | KeyUsage.nonRepudiation);
/*============LICENSE_START=======================================================
* oom-truststore-merger
* ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
+ * Copyright (C) 2020-2021 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.
import org.bouncycastle.openssl.jcajce.JcaMiscPEMGenerator;
import org.bouncycastle.util.io.pem.PemObjectGenerator;
import org.bouncycastle.util.io.pem.PemWriter;
+import org.onap.oom.certservice.postprocessor.common.FileTools;
import org.onap.oom.certservice.postprocessor.merger.exception.MissingTruststoreException;
import org.onap.oom.certservice.postprocessor.merger.exception.TruststoreDataOperationException;
import org.onap.oom.certservice.postprocessor.merger.exception.WriteTruststoreFileException;
-import org.onap.oom.certservice.postprocessor.common.FileTools;
import org.onap.oom.certservice.postprocessor.merger.model.certificate.CertificateWithAlias;
import org.onap.oom.certservice.postprocessor.merger.model.certificate.CertificateWithAliasFactory;
import org.slf4j.Logger;
private List<Certificate> extractCertificatesFromFile() throws TruststoreDataOperationException {
try (FileInputStream inputStream = new FileInputStream(storeFile)) {
Security.addProvider(new BouncyCastleProvider());
- CertificateFactory factory = CertificateFactory.getInstance(X_509_CERTIFICATE, BOUNCY_CASTLE_PROVIDER);
- return new ArrayList<>(factory.generateCertificates(inputStream));
+ CertificateFactory certFactory = CertificateFactory.getInstance(X_509_CERTIFICATE, BOUNCY_CASTLE_PROVIDER);
+ return new ArrayList<>(certFactory.generateCertificates(inputStream));
} catch (Exception e) {
LOGGER.error("Cannot read certificates from file: {}", storeFile.getPath());
throw new TruststoreDataOperationException(e);
}
private void appendToFile(String certificatesAsString) throws WriteTruststoreFileException {
- try {
- FileOutputStream fileOutputStream = new FileOutputStream(storeFile, APPEND_TO_FILE);
+ try (FileOutputStream fileOutputStream = new FileOutputStream(storeFile, APPEND_TO_FILE)) {
fileOutputStream.write(certificatesAsString.getBytes());
} catch (Exception e) {
LOGGER.error("Cannot write certificates to file");
/*============LICENSE_START=======================================================
* oom-truststore-merger
* ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
+ * Copyright (C) 2020-2021 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.
private final FileTools fileTools;
- public Truststore(File storeFile, FileTools fileTools) {
+ protected Truststore(File storeFile, FileTools fileTools) {
this.storeFile = storeFile;
this.fileTools = fileTools;
}
/*============LICENSE_START=======================================================
* oom-truststore-merger
* ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
+ * Copyright (C) 2020-2021 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.
@Test
void shouldThrowExceptionForNonExistingFile() {
+ final File file = new File("src/test/resources/non-esisting-file.pass");
assertThatExceptionOfType(PasswordReaderException.class)
- .isThrownBy(() -> PasswordReader.readPassword(new File("src/test/resources/non-esisting-file.pass")));
+ .isThrownBy(() -> PasswordReader.readPassword(file));
}
}
/*============LICENSE_START=======================================================
* oom-truststore-merger
* ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
+ * Copyright (C) 2020-2021 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.
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.oom.certservice.postprocessor.configuration.exception.CertificatesPathsValidationException;
+import org.onap.oom.certservice.postprocessor.configuration.model.EnvVariable;
@ExtendWith(MockitoExtension.class)
class DelimitedPathsSplitterTest {
@Test
void shouldThrowExceptionWhenTruststoresPathsEnvIsEmpty() {
// when, then
- assertThatExceptionOfType(CertificatesPathsValidationException.class)
- .isThrownBy(() -> delimitedPathsSplitter.getValidatedPaths(TRUSTSTORES_PATHS, Optional.of("")));
+ assertCorrectExceptionIsThrownFor(TRUSTSTORES_PATHS, "");
}
@Test
void shouldThrowExceptionWhenOneOfTruststoresPathsInvalid() {
// when, then
- assertThatExceptionOfType(CertificatesPathsValidationException.class)
- .isThrownBy(() -> delimitedPathsSplitter
- .getValidatedPaths(TRUSTSTORES_PATHS, Optional.of(INVALID_TRUSTSTORES)));
+ assertCorrectExceptionIsThrownFor(TRUSTSTORES_PATHS, INVALID_TRUSTSTORES);
}
@Test
@Test
void shouldThrowExceptionWhenTruststoresPasswordsPathEnvIsEmpty() {
// when, then
- assertThatExceptionOfType(CertificatesPathsValidationException.class)
- .isThrownBy(
- () -> delimitedPathsSplitter.getValidatedPaths(TRUSTSTORES_PASSWORDS_PATHS, Optional.of("")));
+ assertCorrectExceptionIsThrownFor(TRUSTSTORES_PASSWORDS_PATHS, "");
}
@Test
void shouldThrowExceptionWhenOneOfTruststorePasswordPathsInvalid() {
// when, then
+ assertCorrectExceptionIsThrownFor(TRUSTSTORES_PASSWORDS_PATHS, INVALID_TRUSTSTORES_PASSWORDS);
+ }
+
+ private void assertCorrectExceptionIsThrownFor(EnvVariable envVariable, String envValue) {
+ final Optional<String> envValueOptional = Optional.of(envValue);
assertThatExceptionOfType(CertificatesPathsValidationException.class)
.isThrownBy(() -> delimitedPathsSplitter
- .getValidatedPaths(TRUSTSTORES_PASSWORDS_PATHS, Optional.of(INVALID_TRUSTSTORES_PASSWORDS)));
+ .getValidatedPaths(envVariable, envValueOptional));
}
}
/*============LICENSE_START=======================================================
* oom-truststore-merger
* ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
+ * Copyright (C) 2020-2021 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.
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-public class KeystoreCopierTest {
+class KeystoreCopierTest {
private static final String SOURCE_CONTENT = "source content";
private static final String DESTINATION_CONTENT = "destination content";
copier.copyKeystores(configuration);
- assertThat(dir.listFiles()).isEmpty();
+ assertThat(dir).isEmptyDirectory();
}
copier.copyKeystores(configuration);
assertThat(readFile(destination)).isEqualTo(readFile(source));
- assertThat(backup.exists()).isTrue();
+ assertThat(backup).exists();
assertThat(readFile(backup)).isEqualTo(DESTINATION_CONTENT);
}
copier.copyKeystores(configuration);
- assertThat(destination.exists()).isTrue();
+ assertThat(destination).exists();
assertThat(readFile(destination)).isEqualTo(readFile(source));
- assertThat(backup.exists()).isFalse();
+ assertThat(backup).doesNotExist();
}
@Test
copier.copyKeystores(configuration)
);
- assertThat(source.exists()).isFalse();
- assertThat(destination.exists()).isFalse();
- assertThat(backup.exists()).isFalse();
+ assertThat(source).doesNotExist();
+ assertThat(destination).doesNotExist();
+ assertThat(backup).doesNotExist();
}
@Test
copier.copyKeystores(configuration)
);
- assertThat(source.exists()).isTrue();
- assertThat(destination.exists()).isFalse();
- assertThat(backup.exists()).isFalse();
+ assertThat(source).exists();
+ assertThat(destination).doesNotExist();
+ assertThat(backup).doesNotExist();
}
private AppConfiguration createConfiguration(File source, File destination) {
/*============LICENSE_START=======================================================
* oom-truststore-merger
* ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
+ * Copyright (C) 2020-2021 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.
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
-import org.onap.oom.certservice.postprocessor.api.CertificateConstants;
import org.onap.oom.certservice.postprocessor.api.ExitableException;
import org.onap.oom.certservice.postprocessor.merger.exception.CreateBackupException;
import org.onap.oom.certservice.postprocessor.merger.exception.KeystoreInstanceException;
//then
File backupFile = new File(PEM_BACKUP_FILE_PATH);
- assertThat(backupFile.getName().endsWith(BACKUP_EXTENSION)).isTrue();
- assertThat(backupFile.isFile()).isTrue();
+ assertThat(backupFile.getName()).endsWith(BACKUP_EXTENSION);
+ assertThat(backupFile).isFile();
}
@ParameterizedTest
TestCertificateProvider.removeTemporaryFiles();
}
- private static Stream<Arguments> truststoreProvider()
- throws LoadTruststoreException, KeystoreInstanceException, PasswordReaderException {
- return Stream.of(
- Arguments.of(TestCertificateProvider.getSampleJksTruststoreFile()),
- Arguments.of(TestCertificateProvider.getSampleP12Truststore()),
- Arguments.of(TestCertificateProvider.getSamplePemTruststoreFile())
- );
- }
-
}
Code Review / oom / platform / cert-service.git / commitdiff