import java.util.List;
import org.onap.oom.truststoremerger.api.ExitStatus;
import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.certification.file.TruststoreFileFactory;
-import org.onap.oom.truststoremerger.certification.file.TruststoreFilesListProvider;
-import org.onap.oom.truststoremerger.certification.file.model.Truststore;
-import org.onap.oom.truststoremerger.certification.file.provider.FileManager;
-import org.onap.oom.truststoremerger.certification.file.provider.PasswordReader;
-import org.onap.oom.truststoremerger.certification.file.provider.entry.CertificateWithAlias;
+import org.onap.oom.truststoremerger.merger.TruststoreFilesProvider;
+import org.onap.oom.truststoremerger.merger.model.Truststore;
+import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAlias;
import org.onap.oom.truststoremerger.configuration.MergerConfigurationProvider;
import org.onap.oom.truststoremerger.configuration.model.MergerConfiguration;
import org.onap.oom.truststoremerger.configuration.path.DelimitedPathsReader;
baseFile.createBackup();
for (int i = SECOND_TRUSTSTORE_INDEX; i < truststoreFilesList.size(); i++) {
- List<CertificateWithAlias> certificateWrappers = truststoreFilesList.get(i).getCertificates();
- baseFile.addCertificate(certificateWrappers);
+ Truststore truststore = truststoreFilesList.get(i);
+ List<CertificateWithAlias> certificateWrappers = truststore.getCertificates();
+ baseFile.addCertificates(certificateWrappers);
}
baseFile.saveFile();
return factory.createConfiguration();
}
- private List<Truststore> getTruststoreFiles(MergerConfiguration configuration) throws ExitableException {
- TruststoreFileFactory truststoreFileFactory = new TruststoreFileFactory(new FileManager(),
- new PasswordReader());
- TruststoreFilesListProvider truststoreFilesListProvider = new TruststoreFilesListProvider(
- truststoreFileFactory);
- return truststoreFilesListProvider
- .getTruststoreFilesList(
+ private static List<Truststore> getTruststoreFiles(MergerConfiguration configuration) throws ExitableException {
+ return TruststoreFilesProvider
+ .getTruststoreFiles(
configuration.getTruststoreFilePaths(),
configuration.getTruststoreFilePasswordPaths()
);
public class CertificateConstants {
- public static final String JKS_INSTANCE = "JKS";
- public static final String PKCS12_INSTANCE = "PKCS12";
+ public static final String JKS_TYPE = "JKS";
+ public static final String PKCS12_TYPE = "PKCS12";
public static final String X_509_CERTIFICATE = "X.509";
public static final String BOUNCY_CASTLE_PROVIDER = "BC";
+++ /dev/null
-/*============LICENSE_START=======================================================
- * oom-truststore-merger
- * ================================================================================
- * 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.oom.truststoremerger.certification.file;
-
-import org.onap.oom.truststoremerger.certification.file.model.JavaTruststore;
-import org.onap.oom.truststoremerger.certification.file.model.PemTruststore;
-import org.onap.oom.truststoremerger.certification.file.model.Truststore;
-
-import java.io.File;
-import org.onap.oom.truststoremerger.certification.file.exception.KeystoreInstanceException;
-import org.onap.oom.truststoremerger.certification.file.exception.LoadTruststoreException;
-import org.onap.oom.truststoremerger.certification.file.exception.PasswordReaderException;
-import org.onap.oom.truststoremerger.certification.file.exception.TruststoreFileFactoryException;
-import org.onap.oom.truststoremerger.certification.file.provider.CertificateStoreControllerFactory;
-import org.onap.oom.truststoremerger.certification.file.provider.FileManager;
-import org.onap.oom.truststoremerger.certification.file.provider.JavaCertificateStoreController;
-import org.onap.oom.truststoremerger.certification.file.provider.PasswordReader;
-import org.onap.oom.truststoremerger.certification.file.provider.PemCertificateController;
-
-public class TruststoreFileFactory {
-
- private static final String JKS_EXTENSION = ".jks";
- private static final String P12_EXTENSION = ".p12";
- private static final String PEM_EXTENSION = ".pem";
- private static final String FILE_DOES_NOT_EXIST_MSG_TEMPLATE = "File: %s does not exist";
- private static final String UNKNOWN_TRUSTSTORE_TYPE_MSG_TEMPLATE = "Unknown truststore extension type: %s";
-
- private final FileManager fileManager;
- private final PasswordReader passwordReader;
- private final CertificateStoreControllerFactory certificateStoreControllerFactory =
- new CertificateStoreControllerFactory();
-
- public TruststoreFileFactory(FileManager fileManager, PasswordReader passwordReader) {
- this.fileManager = fileManager;
- this.passwordReader = passwordReader;
- }
-
- public Truststore create(String truststoreFilePath, String truststorePasswordPath)
- throws TruststoreFileFactoryException, PasswordReaderException, KeystoreInstanceException, LoadTruststoreException {
- File truststoreFile = new File(truststoreFilePath);
- if (!fileManager.checkIfFileExists(truststoreFile)) {
- throw new TruststoreFileFactoryException(String.format(FILE_DOES_NOT_EXIST_MSG_TEMPLATE, truststoreFile));
- }
- return createTypedTruststore(truststoreFile, truststorePasswordPath);
- }
-
- private Truststore createTypedTruststore(File truststoreFile, String truststorePasswordPath)
- throws KeystoreInstanceException, PasswordReaderException, LoadTruststoreException, TruststoreFileFactoryException {
- String extension = fileManager.getExtension(truststoreFile);
- switch (extension) {
- case JKS_EXTENSION:
- return createJksTruststore(truststoreFile, truststorePasswordPath);
- case P12_EXTENSION:
- return createP12Truststore(truststoreFile, truststorePasswordPath);
- case PEM_EXTENSION:
- return createPemTruststore(truststoreFile);
- default:
- throw new TruststoreFileFactoryException(
- String.format(UNKNOWN_TRUSTSTORE_TYPE_MSG_TEMPLATE, extension));
- }
- }
-
- private JavaTruststore createJksTruststore(File truststoreFile, String truststorePasswordPath)
- throws PasswordReaderException, LoadTruststoreException, KeystoreInstanceException {
- String password = passwordReader.readPassword(new File(truststorePasswordPath));
- JavaCertificateStoreController storeController = certificateStoreControllerFactory
- .createLoadedJksCertificateStoreController(truststoreFile, password);
- return new JavaTruststore(truststoreFile, storeController);
- }
-
- private JavaTruststore createP12Truststore(File truststoreFile, String truststorePasswordPath)
- throws LoadTruststoreException, KeystoreInstanceException, PasswordReaderException {
- String password = passwordReader.readPassword(new File(truststorePasswordPath));
- JavaCertificateStoreController storeController = certificateStoreControllerFactory
- .createLoadedPkcs12CertificateStoreController(truststoreFile, password);
- return new JavaTruststore(truststoreFile, storeController);
- }
-
- private PemTruststore createPemTruststore(File truststoreFile) {
- return new PemTruststore(truststoreFile, new PemCertificateController(truststoreFile));
- }
-}
+++ /dev/null
-/*============LICENSE_START=======================================================
- * oom-truststore-merger
- * ================================================================================
- * 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.oom.truststoremerger.certification.file.model;
-
-import java.io.File;
-import java.util.List;
-import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.certification.file.provider.entry.CertificateWithAlias;
-import org.onap.oom.truststoremerger.certification.file.exception.WriteTruststoreFileException;
-import org.onap.oom.truststoremerger.certification.file.provider.JavaCertificateStoreController;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class JavaTruststore extends Truststore {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(JavaTruststore.class);
- private final JavaCertificateStoreController storeController;
-
- public JavaTruststore(File truststoreFile, JavaCertificateStoreController storeController) {
- super(truststoreFile);
- this.storeController = storeController;
- }
-
- @Override
- public List<CertificateWithAlias> getCertificates() throws ExitableException {
- LOGGER.debug("Attempt ro read certificates from file: {} ", this.getFile().getPath());
- return storeController.getNotEmptyCertificateList();
- }
-
- @Override
- public void addCertificate(List<CertificateWithAlias> certificates) throws ExitableException {
- LOGGER.debug("Attempt to add certificates for saving to file");
- storeController.addCertificates(certificates);
- }
-
- @Override
- public void saveFile() throws WriteTruststoreFileException {
- LOGGER.debug("Attempt to save file: {}", this.getFile().getPath());
- storeController.saveFile();
- }
-}
+++ /dev/null
-/*============LICENSE_START=======================================================
- * oom-truststore-merger
- * ================================================================================
- * 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.oom.truststoremerger.certification.file.model;
-
-import java.io.File;
-import java.util.List;
-import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.certification.file.provider.entry.CertificateWithAlias;
-import org.onap.oom.truststoremerger.certification.file.provider.PemCertificateController;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class PemTruststore extends Truststore {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(PemTruststore.class);
- private final PemCertificateController pemCertificateController;
-
- public PemTruststore(File truststoreFile, PemCertificateController pemCertificateController) {
- super(truststoreFile);
- this.pemCertificateController = pemCertificateController;
- }
-
- @Override
- public List<CertificateWithAlias> getCertificates() throws ExitableException {
- LOGGER.debug("Attempt ro read certificates from file: {}", this.getFile().getPath());
- return pemCertificateController.getNotEmptyCertificateList();
- }
-
- @Override
- public void addCertificate(List<CertificateWithAlias> certificates) throws ExitableException {
- LOGGER.debug("Attempt to add certificates for saving to file");
- pemCertificateController.addCertificates(certificates);
- }
-
- @Override
- public void saveFile() throws ExitableException {
- LOGGER.debug("Attempt to save file: {}", this.getFile().getPath());
- pemCertificateController.saveFile();
- }
-
-}
+++ /dev/null
-/*============LICENSE_START=======================================================
- * oom-truststore-merger
- * ================================================================================
- * 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.oom.truststoremerger.certification.file.provider;
-
-import static org.onap.oom.truststoremerger.api.CertificateConstants.JKS_INSTANCE;
-import static org.onap.oom.truststoremerger.api.CertificateConstants.PKCS12_INSTANCE;
-
-import java.io.File;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import org.onap.oom.truststoremerger.certification.file.exception.KeystoreInstanceException;
-import org.onap.oom.truststoremerger.certification.file.exception.LoadTruststoreException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CertificateStoreControllerFactory {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(CertificateStoreControllerFactory.class);
-
- public JavaCertificateStoreController createLoadedJksCertificateStoreController(File certFile, String certPassword)
- throws LoadTruststoreException, KeystoreInstanceException {
- return createLoadedCertificateStoreController(certFile, certPassword, JKS_INSTANCE);
- }
-
- public JavaCertificateStoreController createLoadedPkcs12CertificateStoreController(File certFile, String certPassword)
- throws KeystoreInstanceException, LoadTruststoreException {
- return createLoadedCertificateStoreController(certFile, certPassword, PKCS12_INSTANCE);
- }
-
- private JavaCertificateStoreController createLoadedCertificateStoreController(File certFile, String certPassword,
- String instanceType)
- throws LoadTruststoreException, KeystoreInstanceException {
- try {
- JavaCertificateStoreController javaCertificateStoreController = new JavaCertificateStoreController(
- KeyStore.getInstance(instanceType), certFile, certPassword);
- javaCertificateStoreController.loadFile();
- return javaCertificateStoreController;
- } catch (KeyStoreException e) {
- LOGGER.error("Cannot initialize Java Keystore instance");
- throw new KeystoreInstanceException(e);
- }
- }
-}
-
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.model;
+package org.onap.oom.truststoremerger.common;
import java.io.File;
import java.io.FileOutputStream;
import java.nio.file.Files;
-import java.util.List;
-import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.certification.file.provider.entry.CertificateWithAlias;
-import org.onap.oom.truststoremerger.certification.file.exception.CreateBackupException;
+import org.onap.oom.truststoremerger.merger.exception.CreateBackupException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public abstract class Truststore {
+public final class BackupCreator {
- private static final Logger LOGGER = LoggerFactory.getLogger(Truststore.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(BackupCreator.class);
private static final String BACKUP_EXTENSION = ".bak";
- private final File file;
- Truststore(File file) {
- this.file = file;
+ private BackupCreator() {
}
- public abstract List<CertificateWithAlias> getCertificates() throws ExitableException;
-
- public abstract void addCertificate(List<CertificateWithAlias> certificates) throws ExitableException;
-
- public abstract void saveFile() throws ExitableException;
-
- public File getFile() {
- return file;
- }
-
- public void createBackup() throws CreateBackupException {
+ public static void createBackup(File file) throws CreateBackupException {
LOGGER.debug("Create backup of file: {}", file.getPath());
String backupFilePath = file.getAbsolutePath() + BACKUP_EXTENSION;
try (FileOutputStream fileOutputStream = new FileOutputStream(backupFilePath)) {
Files.copy(file.toPath(), fileOutputStream);
} catch (Exception e) {
- LOGGER.error("Cannot create backup of file: {} ", getFile().getPath());
+ LOGGER.error("Cannot create backup of file: {} ", file.getPath());
throw new CreateBackupException(e);
}
+ LOGGER.debug("Backup was successfully created in: {}", backupFilePath);
}
}
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.provider;
+package org.onap.oom.truststoremerger.common;
import java.io.File;
-public class FileManager {
+public final class ExtensionResolver {
private static final int INDEX_NOT_FOUND = -1;
- public String getExtension(File file) {
+ private ExtensionResolver() {}
+
+ public static String get(File file) {
int extStartIndex = file.getName().lastIndexOf(".");
if (extStartIndex == INDEX_NOT_FOUND) {
return "";
return file.getName().substring(extStartIndex).toLowerCase();
}
- public boolean checkIfFileExists(File file) {
+ public static boolean checkIfFileExists(File file) {
return file.exists();
}
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.provider;
+package org.onap.oom.truststoremerger.common;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
-import org.onap.oom.truststoremerger.certification.file.exception.PasswordReaderException;
+import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
+
+public final class PasswordReader {
-public class PasswordReader {
private static final String COULD_NOT_READ_PASSWORD_FROM_FILE_MSG_TEMPLATE = "Could not read password from file: %s";
- public String readPassword(File file) throws PasswordReaderException {
+ private PasswordReader() {
+ }
+
+ public static String readPassword(File file) throws PasswordReaderException {
try {
return Files.readString(file.toPath());
} catch (IOException e) {
public class MergerConfigurationException extends ExitableException {
- public MergerConfigurationException(String message) {
- super(message, ExitStatus.MERGER_CONFIGURATION_EXCEPTION);
+ public MergerConfigurationException(String errorMessage) {
+ super(errorMessage, ExitStatus.MERGER_CONFIGURATION_EXCEPTION);
}
}
public class TruststoresPathsProviderException extends ExitableException {
- public TruststoresPathsProviderException(String message) {
- super(message, ExitStatus.TRUSTSTORES_PATHS_PROVIDER_EXCEPTION);
+ public TruststoresPathsProviderException(String errorMessage) {
+ super(errorMessage, ExitStatus.TRUSTSTORES_PATHS_PROVIDER_EXCEPTION);
}
}
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file;
-
-import org.onap.oom.truststoremerger.certification.file.model.Truststore;
+package org.onap.oom.truststoremerger.merger;
import java.util.ArrayList;
import java.util.List;
-import org.onap.oom.truststoremerger.certification.file.exception.KeystoreInstanceException;
-import org.onap.oom.truststoremerger.certification.file.exception.LoadTruststoreException;
-import org.onap.oom.truststoremerger.certification.file.exception.PasswordReaderException;
-import org.onap.oom.truststoremerger.certification.file.exception.TruststoreFileFactoryException;
+import org.onap.oom.truststoremerger.merger.exception.KeystoreInstanceException;
+import org.onap.oom.truststoremerger.merger.exception.LoadTruststoreException;
+import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
+import org.onap.oom.truststoremerger.merger.exception.TruststoreFileFactoryException;
+import org.onap.oom.truststoremerger.merger.model.TruststoreFactory;
+import org.onap.oom.truststoremerger.merger.model.Truststore;
-public class TruststoreFilesListProvider {
+public class TruststoreFilesProvider {
- private final TruststoreFileFactory truststoreFileFactory;
- public TruststoreFilesListProvider(TruststoreFileFactory truststoreFileFactory) {
- this.truststoreFileFactory = truststoreFileFactory;
+ private TruststoreFilesProvider() {
}
- public List<Truststore> getTruststoreFilesList(List<String> truststoreFilePaths,
+ public static List<Truststore> getTruststoreFiles(List<String> truststoreFilePaths,
List<String> truststoreFilePasswordPaths)
throws LoadTruststoreException, PasswordReaderException, TruststoreFileFactoryException, KeystoreInstanceException {
- List<Truststore> truststoreFilesList = new ArrayList<>();
+ List<Truststore> truststoreFiles = new ArrayList<>();
for (int i = 0; i < truststoreFilePaths.size(); i++) {
String truststorePath = truststoreFilePaths.get(i);
String passwordPath = truststoreFilePasswordPaths.get(i);
- Truststore truststore = truststoreFileFactory.create(truststorePath, passwordPath);
- truststoreFilesList.add(truststore);
+ Truststore truststore = TruststoreFactory.create(truststorePath, passwordPath);
+ truststoreFiles.add(truststore);
}
- return truststoreFilesList;
+ return truststoreFiles;
}
}
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.exception;
+package org.onap.oom.truststoremerger.merger.exception;
import org.onap.oom.truststoremerger.api.ExitStatus;
import org.onap.oom.truststoremerger.api.ExitableException;
public class AliasConflictException extends ExitableException {
- public AliasConflictException(String message) {
- super(message, ExitStatus.ALIAS_CONFLICT_EXCEPTION);
+ public AliasConflictException(String errorMessage) {
+ super(errorMessage, ExitStatus.ALIAS_CONFLICT_EXCEPTION);
}
}
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.exception;
+package org.onap.oom.truststoremerger.merger.exception;
import org.onap.oom.truststoremerger.api.ExitStatus;
import org.onap.oom.truststoremerger.api.ExitableException;
public class CreateBackupException extends ExitableException {
- public CreateBackupException(Exception e) {
- super(e, ExitStatus.CREATE_BACKUP_EXCEPTION);
+ public CreateBackupException(Exception cause) {
+ super(cause, ExitStatus.CREATE_BACKUP_EXCEPTION);
}
}
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.exception;
+package org.onap.oom.truststoremerger.merger.exception;
import org.onap.oom.truststoremerger.api.ExitStatus;
import org.onap.oom.truststoremerger.api.ExitableException;
public class KeystoreInstanceException extends ExitableException {
- public KeystoreInstanceException(Throwable e) {
- super(e, ExitStatus.KEYSTORE_INSTANCE_EXCEPTION);
+ public KeystoreInstanceException(Exception cause) {
+ super(cause, ExitStatus.KEYSTORE_INSTANCE_EXCEPTION);
}
}
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.exception;
+package org.onap.oom.truststoremerger.merger.exception;
import org.onap.oom.truststoremerger.api.ExitStatus;
import org.onap.oom.truststoremerger.api.ExitableException;
public class LoadTruststoreException extends ExitableException {
- public LoadTruststoreException(Throwable e) {
- super(e, ExitStatus.TRUSTSTORE_LOAD_FILE_EXCEPTION);
+ public LoadTruststoreException(Exception cause) {
+ super(cause, ExitStatus.TRUSTSTORE_LOAD_FILE_EXCEPTION);
}
}
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.exception;
+package org.onap.oom.truststoremerger.merger.exception;
import org.onap.oom.truststoremerger.api.ExitStatus;
import org.onap.oom.truststoremerger.api.ExitableException;
public class MissingTruststoreException extends ExitableException {
- public MissingTruststoreException(String message) {
- super(message, ExitStatus.MISSING_TRUSTSTORE_EXCEPTION);
+ public MissingTruststoreException(String errorMessage) {
+ super(errorMessage, ExitStatus.MISSING_TRUSTSTORE_EXCEPTION);
}
}
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.exception;
+package org.onap.oom.truststoremerger.merger.exception;
import org.onap.oom.truststoremerger.api.ExitStatus;
import org.onap.oom.truststoremerger.api.ExitableException;
public class PasswordReaderException extends ExitableException {
- public PasswordReaderException(String message) {
- super(message, ExitStatus.PASSWORD_READER_EXCEPTION);
+ public PasswordReaderException(String errorMessage) {
+ super(errorMessage, ExitStatus.PASSWORD_READER_EXCEPTION);
}
}
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.exception;
+package org.onap.oom.truststoremerger.merger.exception;
import org.onap.oom.truststoremerger.api.ExitStatus;
import org.onap.oom.truststoremerger.api.ExitableException;
public class TruststoreDataOperationException extends ExitableException {
- public TruststoreDataOperationException(Exception e) {
- super(e, ExitStatus.TRUSTSTORE_DATA_OPERATION_EXCEPTION);
+ public TruststoreDataOperationException(Exception cause) {
+ super(cause, ExitStatus.TRUSTSTORE_DATA_OPERATION_EXCEPTION);
}
}
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.exception;
+package org.onap.oom.truststoremerger.merger.exception;
import org.onap.oom.truststoremerger.api.ExitStatus;
import org.onap.oom.truststoremerger.api.ExitableException;
public class TruststoreFileFactoryException extends ExitableException {
- public TruststoreFileFactoryException(String message) {
- super(message, ExitStatus.TRUSTSTORE_FILE_FACTORY_EXCEPTION);
+ public TruststoreFileFactoryException(String errorMessage) {
+ super(errorMessage, ExitStatus.TRUSTSTORE_FILE_FACTORY_EXCEPTION);
}
}
*/
-package org.onap.oom.truststoremerger.certification.file.exception;
+package org.onap.oom.truststoremerger.merger.exception;
import org.onap.oom.truststoremerger.api.ExitStatus;
import org.onap.oom.truststoremerger.api.ExitableException;
public class WriteTruststoreFileException extends ExitableException {
- public WriteTruststoreFileException(Exception e) {
- super(e, ExitStatus.WRITE_TRUSTSTORE_FILE_EXCEPTION);
+ public WriteTruststoreFileException(Exception cause) {
+ super(cause, ExitStatus.WRITE_TRUSTSTORE_FILE_EXCEPTION);
}
}
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.provider;
+package org.onap.oom.truststoremerger.merger.model;
import java.io.File;
import java.io.FileInputStream;
import java.util.Collections;
import java.util.List;
import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.certification.file.exception.AliasConflictException;
-import org.onap.oom.truststoremerger.certification.file.exception.LoadTruststoreException;
-import org.onap.oom.truststoremerger.certification.file.exception.MissingTruststoreException;
-import org.onap.oom.truststoremerger.certification.file.exception.TruststoreDataOperationException;
-import org.onap.oom.truststoremerger.certification.file.exception.WriteTruststoreFileException;
-import org.onap.oom.truststoremerger.certification.file.provider.entry.CertificateWithAlias;
-import org.onap.oom.truststoremerger.certification.file.provider.entry.CertificateWithAliasFactory;
+import org.onap.oom.truststoremerger.merger.exception.AliasConflictException;
+import org.onap.oom.truststoremerger.merger.exception.LoadTruststoreException;
+import org.onap.oom.truststoremerger.merger.exception.MissingTruststoreException;
+import org.onap.oom.truststoremerger.merger.exception.TruststoreDataOperationException;
+import org.onap.oom.truststoremerger.merger.exception.WriteTruststoreFileException;
+import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAlias;
+import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAliasFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class JavaCertificateStoreController implements CertificateController {
+public final class JavaTruststore extends Truststore {
- private static final Logger LOGGER = LoggerFactory.getLogger(JavaCertificateStoreController.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(JavaTruststore.class);
private final CertificateWithAliasFactory factory = new CertificateWithAliasFactory();
private final KeyStore keyStore;
- private final File storeFile;
private final String password;
- public JavaCertificateStoreController(KeyStore keyStore, File storeFile, String password) {
+ private JavaTruststore(KeyStore keyStore, File storeFile, String password) {
+ super(storeFile);
this.keyStore = keyStore;
- this.storeFile = storeFile;
this.password = password;
}
- public List<CertificateWithAlias> getNotEmptyCertificateList() throws ExitableException {
+ public static JavaTruststore createWithLoadingFile(KeyStore keyStore, File storeFile, String password)
+ throws LoadTruststoreException {
+ JavaTruststore javaTruststore = new JavaTruststore(keyStore, storeFile, password);
+ javaTruststore.loadFile();
+ return javaTruststore;
+ }
+
+ public List<CertificateWithAlias> getCertificates() throws ExitableException {
+ LOGGER.debug("Attempt to read certificates from file: {}", storeFile.getPath());
List<String> aliases = getTruststoreAliases();
if (aliases.isEmpty()) {
throw new MissingTruststoreException("Missing certificate aliases in file: " + storeFile.getPath());
public void addCertificates(List<CertificateWithAlias> certificatesWithAliases)
throws ExitableException {
+ LOGGER.debug("Attempt to add certificates for saving to file");
if (getTruststoreAliases().isEmpty()) {
throw new MissingTruststoreException("Missing certificate aliases in file: " + storeFile.getPath());
}
}
public void saveFile() throws WriteTruststoreFileException {
- try (FileOutputStream outputStream = new FileOutputStream(this.storeFile)) {
+ LOGGER.debug("Attempt to save file: {}", storeFile.getPath());
+ try (FileOutputStream outputStream = new FileOutputStream(storeFile)) {
keyStore.store(outputStream, this.password.toCharArray());
} catch (Exception e) {
LOGGER.error("Cannot write truststore file");
}
}
- public void loadFile() throws LoadTruststoreException {
+ private void loadFile() throws LoadTruststoreException {
try {
- keyStore.load(new FileInputStream(this.storeFile), this.password.toCharArray());
+ keyStore.load(new FileInputStream(storeFile), this.password.toCharArray());
} catch (Exception e) {
- LOGGER.error("Cannot load file: {}", this.storeFile.getPath());
+ LOGGER.error("Cannot load file: {}", storeFile.getPath());
throw new LoadTruststoreException(e);
}
}
--- /dev/null
+/*============LICENSE_START=======================================================
+ * oom-truststore-merger
+ * ================================================================================
+ * 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.oom.truststoremerger.merger.model;
+
+import java.io.File;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import org.onap.oom.truststoremerger.common.PasswordReader;
+import org.onap.oom.truststoremerger.merger.exception.KeystoreInstanceException;
+import org.onap.oom.truststoremerger.merger.exception.LoadTruststoreException;
+import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class JavaTruststoreFactory {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(JavaTruststoreFactory.class);
+
+ private JavaTruststoreFactory() {
+ }
+
+ public static Truststore create(File certFile, String truststorePasswordPath, String keystoreType)
+ throws LoadTruststoreException, KeystoreInstanceException, PasswordReaderException {
+ String password = PasswordReader.readPassword(new File(truststorePasswordPath));
+ try {
+ return JavaTruststore
+ .createWithLoadingFile(KeyStore.getInstance(keystoreType), certFile, password);
+ } catch (KeyStoreException e) {
+ LOGGER.error("Cannot initialize Java Keystore instance");
+ throw new KeystoreInstanceException(e);
+ }
+ }
+}
+
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.provider;
+package org.onap.oom.truststoremerger.merger.model;
import static org.onap.oom.truststoremerger.api.CertificateConstants.BOUNCY_CASTLE_PROVIDER;
import static org.onap.oom.truststoremerger.api.CertificateConstants.X_509_CERTIFICATE;
import org.bouncycastle.openssl.jcajce.JcaMiscPEMGenerator;
import org.bouncycastle.util.io.pem.PemObjectGenerator;
import org.bouncycastle.util.io.pem.PemWriter;
-import org.onap.oom.truststoremerger.certification.file.provider.entry.CertificateWithAlias;
-import org.onap.oom.truststoremerger.certification.file.provider.entry.CertificateWithAliasFactory;
-import org.onap.oom.truststoremerger.certification.file.exception.MissingTruststoreException;
-import org.onap.oom.truststoremerger.certification.file.exception.TruststoreDataOperationException;
-import org.onap.oom.truststoremerger.certification.file.exception.WriteTruststoreFileException;
+import org.onap.oom.truststoremerger.merger.exception.MissingTruststoreException;
+import org.onap.oom.truststoremerger.merger.exception.TruststoreDataOperationException;
+import org.onap.oom.truststoremerger.merger.exception.WriteTruststoreFileException;
+import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAlias;
+import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAliasFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class PemCertificateController implements CertificateController {
+public class PemTruststore extends Truststore {
- private static final Logger LOGGER = LoggerFactory.getLogger(PemCertificateController.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PemTruststore.class);
private static final boolean APPEND_TO_FILE = true;
private final CertificateWithAliasFactory factory = new CertificateWithAliasFactory();
private final List<CertificateWithAlias> certificatesToBeSaved = new ArrayList<>();
- private final File file;
- public PemCertificateController(File file) {
- this.file = file;
+ public PemTruststore(File storeFile) {
+ super(storeFile);
}
- public List<CertificateWithAlias> getNotEmptyCertificateList()
+ public List<CertificateWithAlias> getCertificates()
throws TruststoreDataOperationException, MissingTruststoreException {
+ LOGGER.debug("Attempt to read certificates from file: {}", storeFile.getPath());
if (isFileWithoutPemCertificate()) {
throw new MissingTruststoreException("File does not contain any certificate");
}
public void addCertificates(List<CertificateWithAlias> certificates)
throws TruststoreDataOperationException, MissingTruststoreException {
+ LOGGER.debug("Attempt to add certificates for saving to file");
if (isFileWithoutPemCertificate()) {
- LOGGER.error("File does not contain any certificate. File path: {} ", this.file.getPath());
+ LOGGER.error("File does not contain any certificate. File path: {} ", storeFile.getPath());
throw new MissingTruststoreException("File does not contain any certificate");
}
certificatesToBeSaved.addAll(certificates);
}
public void saveFile() throws WriteTruststoreFileException, TruststoreDataOperationException {
+ LOGGER.debug("Attempt to save file: {}", storeFile.getPath());
List<Certificate> certificates = certificatesToBeSaved.stream()
.map(CertificateWithAlias::getCertificate)
.collect(Collectors.toList());
return sw.toString();
}
-
private List<Certificate> extractCertificatesFromFile() throws TruststoreDataOperationException {
- try (FileInputStream inputStream = new FileInputStream(this.file)) {
+ 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));
} catch (Exception e) {
- LOGGER.error("Cannot read certificates from file: {}", this.file.getPath());
+ LOGGER.error("Cannot read certificates from file: {}", storeFile.getPath());
throw new TruststoreDataOperationException(e);
}
}
-
private List<PemObjectGenerator> transformToPemGenerators(List<Certificate> certificates)
throws TruststoreDataOperationException {
List<PemObjectGenerator> generators = new ArrayList<>();
private void appendToFile(String certificatesAsString) throws WriteTruststoreFileException {
try {
- FileOutputStream fileOutputStream = new FileOutputStream(this.file, APPEND_TO_FILE);
+ FileOutputStream fileOutputStream = new FileOutputStream(storeFile, APPEND_TO_FILE);
fileOutputStream.write(certificatesAsString.getBytes());
} catch (Exception e) {
LOGGER.error("Cannot write certificates to file");
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.provider;
+package org.onap.oom.truststoremerger.merger.model;
+import java.io.File;
import java.util.List;
import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.certification.file.provider.entry.CertificateWithAlias;
+import org.onap.oom.truststoremerger.merger.exception.CreateBackupException;
+import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAlias;
+import org.onap.oom.truststoremerger.common.BackupCreator;
-public interface CertificateController {
+public abstract class Truststore {
- List<CertificateWithAlias> getNotEmptyCertificateList() throws ExitableException;
+ final File storeFile;
- void addCertificates(List<CertificateWithAlias> certificates) throws ExitableException;
+ public Truststore(File storeFile) {
+ this.storeFile = storeFile;
+ }
- void saveFile() throws ExitableException;
+ public void createBackup() throws CreateBackupException {
+ BackupCreator.createBackup(storeFile);
+ }
+
+ public abstract List<CertificateWithAlias> getCertificates() throws ExitableException;
+
+ public abstract void addCertificates(List<CertificateWithAlias> certificates) throws ExitableException;
+
+ public abstract void saveFile() throws ExitableException;
}
--- /dev/null
+/*============LICENSE_START=======================================================
+ * oom-truststore-merger
+ * ================================================================================
+ * 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.oom.truststoremerger.merger.model;
+
+import static org.onap.oom.truststoremerger.api.CertificateConstants.JKS_TYPE;
+import static org.onap.oom.truststoremerger.api.CertificateConstants.PKCS12_TYPE;
+
+import java.io.File;
+import org.onap.oom.truststoremerger.common.ExtensionResolver;
+import org.onap.oom.truststoremerger.merger.exception.KeystoreInstanceException;
+import org.onap.oom.truststoremerger.merger.exception.LoadTruststoreException;
+import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
+import org.onap.oom.truststoremerger.merger.exception.TruststoreFileFactoryException;
+
+public class TruststoreFactory {
+
+ private static final String JKS_EXTENSION = ".jks";
+ private static final String P12_EXTENSION = ".p12";
+ private static final String PEM_EXTENSION = ".pem";
+ private static final String FILE_DOES_NOT_EXIST_MSG_TEMPLATE = "File: %s does not exist";
+ private static final String UNKNOWN_TRUSTSTORE_TYPE_MSG_TEMPLATE = "Unknown truststore extension type: %s";
+
+
+ private TruststoreFactory() {
+ }
+
+ public static Truststore create(String truststoreFilePath, String truststorePasswordPath)
+ throws TruststoreFileFactoryException, PasswordReaderException, KeystoreInstanceException, LoadTruststoreException {
+ File truststoreFile = new File(truststoreFilePath);
+ if (!ExtensionResolver.checkIfFileExists(truststoreFile)) {
+ throw new TruststoreFileFactoryException(String.format(FILE_DOES_NOT_EXIST_MSG_TEMPLATE, truststoreFile));
+ }
+ return createTypedTruststore(truststoreFile, truststorePasswordPath);
+ }
+
+ private static Truststore createTypedTruststore(File truststoreFile, String truststorePasswordPath)
+ throws KeystoreInstanceException, PasswordReaderException, LoadTruststoreException, TruststoreFileFactoryException {
+ String extension = ExtensionResolver.get(truststoreFile);
+ switch (extension) {
+ case JKS_EXTENSION:
+ return JavaTruststoreFactory.create(truststoreFile, truststorePasswordPath, JKS_TYPE);
+ case P12_EXTENSION:
+ return JavaTruststoreFactory.create(truststoreFile, truststorePasswordPath, PKCS12_TYPE);
+ case PEM_EXTENSION:
+ return new PemTruststore(truststoreFile);
+ default:
+ throw new TruststoreFileFactoryException(
+ String.format(UNKNOWN_TRUSTSTORE_TYPE_MSG_TEMPLATE, extension));
+ }
+ }
+
+}
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.provider.entry;
+package org.onap.oom.truststoremerger.merger.model.certificate;
import java.security.cert.Certificate;
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.provider.entry;
+package org.onap.oom.truststoremerger.merger.model.certificate;
import java.security.cert.Certificate;
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.provider.entry;
+package org.onap.oom.truststoremerger.merger.model.certificate;
import java.util.concurrent.atomic.AtomicInteger;
+++ /dev/null
-/*============LICENSE_START=======================================================
- * oom-truststore-merger
- * ================================================================================
- * 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.oom.truststoremerger.certification.file.model;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.onap.oom.truststoremerger.api.CertificateConstants.X_509_CERTIFICATE;
-
-import java.io.IOException;
-import java.security.cert.Certificate;
-import java.util.List;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Test;
-import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.certification.file.provider.entry.CertificateWithAlias;
-import org.onap.oom.truststoremerger.certification.file.TestCertificateProvider;
-
-
-class JavaTruststoreTest {
- public static final int FIRST_ELEMENT = 0;
- private static final int EXPECTED_ONE = 1;
- public static final int EXPECTED_THREE = 3;
-
- @Test
- void jksTruststoreShouldReadCertificatesFromFile() throws ExitableException {
-
- //given
- JavaTruststore jksTruststoreFile = TestCertificateProvider.getSampleJksTruststoreFile();
-
- //when
- List<CertificateWithAlias> certificates = jksTruststoreFile.getCertificates();
- Certificate certificate = certificates.get(FIRST_ELEMENT).getCertificate();
-
- //then
- assertThat(certificates).hasSize(EXPECTED_ONE);
- assertThat(certificate.getType()).isEqualTo(X_509_CERTIFICATE);
- }
-
- @Test
- void jksTruststoreShouldAddDifferentCertificates() throws Exception {
-
- //given
- JavaTruststore jksTruststore = TestCertificateProvider.createTmpJksTruststoreFileWithUniqAlias();
- List<CertificateWithAlias> p12certificates = TestCertificateProvider.getSampleP12Truststore()
- .getCertificates();
- List<CertificateWithAlias> pemCertificates = TestCertificateProvider.getSamplePemTruststoreFile()
- .getCertificates();
-
- //when
- jksTruststore.addCertificate(p12certificates);
- jksTruststore.addCertificate(pemCertificates);
-
- //then
- assertThat(jksTruststore.getCertificates()).hasSize(EXPECTED_THREE);
-
- }
-
- @Test
- void p12TruststoreShouldReadCertificatesFromFile() throws ExitableException {
- //given
- JavaTruststore p12Truststore = TestCertificateProvider.getSampleP12Truststore();
-
- //when
- List<CertificateWithAlias> certificatesWithAliases = p12Truststore.getCertificates();
- Certificate certificate = certificatesWithAliases.get(FIRST_ELEMENT).getCertificate();
-
- //then
- assertThat(certificatesWithAliases).hasSize(EXPECTED_ONE);
- assertThat(certificate.getType()).isEqualTo(X_509_CERTIFICATE);
- }
-
-
- @Test
- void p12TruststoreShouldAddDifferentCertificates() throws Exception {
- //given
- JavaTruststore p12Truststore = TestCertificateProvider.createTmpP12TruststoreFile();
- List<CertificateWithAlias> jksTruststoreCertificates = TestCertificateProvider
- .getSampleJksTruststoreFileWithUniqueAlias()
- .getCertificates();
- List<CertificateWithAlias> pemTruststoreCertificates = TestCertificateProvider.getSamplePemTruststoreFile()
- .getCertificates();
-
- //when
- p12Truststore.addCertificate(jksTruststoreCertificates);
- p12Truststore.addCertificate(pemTruststoreCertificates);
- p12Truststore.saveFile();
-
-
- //then
- JavaTruststore p12TruststoreSaved = TestCertificateProvider.getTmpP12TruststoreFile();
- assertThat(p12TruststoreSaved.getCertificates()).hasSize(EXPECTED_THREE);
- }
-
-
-
- @AfterAll
- static void removeTemporaryFiles() throws IOException {
- TestCertificateProvider.removeTemporaryFiles();
- }
-}
+++ /dev/null
-/*============LICENSE_START=======================================================
- * oom-truststore-merger
- * ================================================================================
- * 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.oom.truststoremerger.certification.file.model;
-
-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.oom.truststoremerger.api.CertificateConstants.X_509_CERTIFICATE;
-
-import java.io.IOException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Test;
-import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.certification.file.provider.entry.CertificateWithAlias;
-import org.onap.oom.truststoremerger.certification.file.provider.entry.CertificateWithAliasFactory;
-import org.onap.oom.truststoremerger.certification.file.TestCertificateProvider;
-import org.onap.oom.truststoremerger.certification.file.exception.MissingTruststoreException;
-import org.onap.oom.truststoremerger.certification.file.exception.TruststoreDataOperationException;
-import org.onap.oom.truststoremerger.certification.file.exception.WriteTruststoreFileException;
-
-class PemTruststoreTest {
-
- public static final int EXPECTED_ONE = 1;
- public static final int EXPECTED_THREE = 3;
- public static final int FIRST_ELEMENT = 0;
-
- private final CertificateWithAliasFactory factory = new CertificateWithAliasFactory();
-
- @Test
- void pemTruststoreShouldReadCertificatesFromFile() throws ExitableException {
-
- //given
- PemTruststore pemTruststore = TestCertificateProvider.getSamplePemTruststoreFile();
-
- //when
- List<CertificateWithAlias> certificates = pemTruststore.getCertificates();
- Certificate certificate = certificates.get(FIRST_ELEMENT).getCertificate();
- //then
-
- assertThat(certificates).hasSize(EXPECTED_ONE);
- assertThat(certificate.getType()).isEqualTo(X_509_CERTIFICATE);
- }
-
- @Test
- void pemTruststoreShouldAddDifferentCertificates() throws IOException, ExitableException {
-
- //given
- PemTruststore tmpPemTruststoreFile = TestCertificateProvider.createTmpPemTruststoreFile();
- List<CertificateWithAlias> jksTruststoreCertificates = TestCertificateProvider
- .getSampleJksTruststoreFileWithUniqueAlias().getCertificates();
- List<CertificateWithAlias> p12TruststoreCertificates = TestCertificateProvider.getSampleP12Truststore()
- .getCertificates();
-
- //when
- tmpPemTruststoreFile.addCertificate(jksTruststoreCertificates);
- tmpPemTruststoreFile.addCertificate(p12TruststoreCertificates);
- tmpPemTruststoreFile.saveFile();
-
- PemTruststore tmpPemTruststoreSaved = TestCertificateProvider.getTmpPemTruststoreFile();
- List<CertificateWithAlias> addedCertificates = tmpPemTruststoreSaved.getCertificates();
- Certificate certificate = addedCertificates.get(FIRST_ELEMENT).getCertificate();
-
- //then
- assertThat(addedCertificates).hasSize(EXPECTED_THREE);
- assertThat(certificate.getType()).isEqualTo(X_509_CERTIFICATE);
-
- }
-
- @Test
- void privateKeyIsSkippedWhileReadingCertificates() throws ExitableException {
- //given
- PemTruststore pemTruststore = TestCertificateProvider.getPemWithPrivateKeyTruststoreFile();
-
- //when
- List<CertificateWithAlias> certificate = pemTruststore.getCertificates();
- //then
-
- assertThat(certificate).hasSize(EXPECTED_ONE);
- }
-
- @Test
- void shouldThrowExceptionWhenCannotSaveFile() throws IOException, ExitableException {
- //given
- PemTruststore tmpPemTruststoreFile = TestCertificateProvider.createTmpPemTruststoreFile();
- List<CertificateWithAlias> pemTruststoreCertificates =
- TestCertificateProvider.getSamplePemTruststoreFile().getCertificates();
- //when
- tmpPemTruststoreFile.addCertificate(pemTruststoreCertificates);
- tmpPemTruststoreFile.getFile().setWritable(false);
- //then
- assertThatExceptionOfType(WriteTruststoreFileException.class)
- .isThrownBy(tmpPemTruststoreFile::saveFile);
-
- }
-
- @Test
- void shouldThrowExceptionWhenFileNotContainsCertificate() throws IOException {
- //given
- PemTruststore tmpPemTruststoreFile = TestCertificateProvider.createEmptyTmpPemTruststoreFile();
- //when//then
- assertThatExceptionOfType(MissingTruststoreException.class)
- .isThrownBy(tmpPemTruststoreFile::getCertificates);
- }
-
- @Test
- void shouldThrowExceptionWhenCannotConvertCertificateToPem() throws Exception {
- //given
- PemTruststore pemTruststore = TestCertificateProvider.createTmpPemTruststoreFile();
- Certificate certificate = mock(Certificate.class);
-
- when(certificate.getEncoded()).thenThrow(new CertificateEncodingException());
-
- List<CertificateWithAlias> certificatesWithAliases = new ArrayList<>();
- certificatesWithAliases.add(factory.createPemCertificate(certificate));
- pemTruststore.addCertificate(certificatesWithAliases);
-
- //when //then
- assertThatExceptionOfType(TruststoreDataOperationException.class)
- .isThrownBy(pemTruststore::saveFile);
- }
-
- @AfterAll
- static void removeTemporaryFiles() throws IOException {
- TestCertificateProvider.removeTemporaryFiles();
- }
-
-}
+++ /dev/null
-/*============LICENSE_START=======================================================
- * oom-truststore-merger
- * ================================================================================
- * 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.oom.truststoremerger.certification.file.model;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Test;
-import org.onap.oom.truststoremerger.certification.file.exception.CreateBackupException;
-import org.onap.oom.truststoremerger.certification.file.provider.PemCertificateController;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class TruststoreTest {
-
- private static final String PEM_FILE_PATH = "src/test/resources/truststore.pem";
- private static final String PEM_BACKUP_FILE_PATH = "src/test/resources/truststore.pem.bak";
- private static final String BACKUP_EXTENSION = ".bak";
-
-
- @Test
- void createBackupShouldCreateFileWithExtension() throws CreateBackupException {
- //given
- File pemFile = new File(PEM_FILE_PATH);
- Truststore truststore = new PemTruststore(pemFile, new PemCertificateController(pemFile));
- //when
- truststore.createBackup();
-
- //then
- File backupFile = new File(PEM_BACKUP_FILE_PATH);
- assertThat(backupFile.getName().endsWith(BACKUP_EXTENSION)).isTrue();
- assertThat(backupFile.isFile()).isTrue();
- }
-
-
- @AfterAll
- static void removeBackupFile() throws IOException {
- Files.deleteIfExists(Paths.get(PEM_BACKUP_FILE_PATH));
- }
-
-}
+++ /dev/null
-/*============LICENSE_START=======================================================
- * oom-truststore-merger
- * ================================================================================
- * 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.oom.truststoremerger.certification.file.provider;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.onap.oom.truststoremerger.certification.file.TruststoreFileFactory;
-import org.onap.oom.truststoremerger.certification.file.TruststoreFilesListProvider;
-import org.onap.oom.truststoremerger.certification.file.model.JavaTruststore;
-import org.onap.oom.truststoremerger.certification.file.model.PemTruststore;
-import org.onap.oom.truststoremerger.certification.file.model.Truststore;
-import org.onap.oom.truststoremerger.certification.file.exception.KeystoreInstanceException;
-import org.onap.oom.truststoremerger.certification.file.exception.LoadTruststoreException;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-import org.onap.oom.truststoremerger.certification.file.exception.PasswordReaderException;
-import org.onap.oom.truststoremerger.certification.file.exception.TruststoreFileFactoryException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class TruststoreFilesListProviderTest {
-
- private static final String TRUSTSTORE_JKS_PATH = "src/test/resources/truststore-jks.jks";
- private static final String TRUSTSTORE_JKS_PASS_PATH = "src/test/resources/truststore-jks.pass";
- private static final String TRUSTSTORE_P12_PATH = "src/test/resources/truststore-p12.p12";
- private static final String TRUSTSTORE_P12_PASS_PATH = "src/test/resources/truststore-p12.pass";
- private static final String TRUSTSTORE_PEM_PATH = "src/test/resources/truststore.pem";
- private static final String EMPTY_PASS_PATH = "";
-
- private TruststoreFilesListProvider truststoreFilesListProvider;
-
- @BeforeEach
- void setUp() {
- TruststoreFileFactory truststoreFileFactory = new TruststoreFileFactory(new FileManager(), new PasswordReader());
- truststoreFilesListProvider = new TruststoreFilesListProvider(truststoreFileFactory);
- }
-
- @Test
- void shouldReturnTruststoreFilesList()
- throws TruststoreFileFactoryException, PasswordReaderException, LoadTruststoreException, KeystoreInstanceException {
- List<String> truststorePaths = Arrays.asList(TRUSTSTORE_JKS_PATH, TRUSTSTORE_P12_PATH, TRUSTSTORE_PEM_PATH);
- List<String> truststorePasswordPaths = Arrays.asList(TRUSTSTORE_JKS_PASS_PATH, TRUSTSTORE_P12_PASS_PATH, EMPTY_PASS_PATH);
- List<Truststore> truststoreFilesList = truststoreFilesListProvider.getTruststoreFilesList(truststorePaths, truststorePasswordPaths);
- assertThat(truststoreFilesList.size()).isEqualTo(3);
- assertCorrectJksTruststore(truststoreFilesList.get(0), TRUSTSTORE_JKS_PATH);
- assertCorrectP12Truststore(truststoreFilesList.get(1), TRUSTSTORE_P12_PATH);
- assertCorrectPemTruststore(truststoreFilesList.get(2), TRUSTSTORE_PEM_PATH);
- }
-
- private void assertCorrectJksTruststore(Truststore truststore, String truststorePath) {
- assertCorrectTypeAndTruststorePath(truststore, truststorePath, JavaTruststore.class);
- }
-
- private void assertCorrectP12Truststore(Truststore truststore, String truststorePath) {
- assertCorrectTypeAndTruststorePath(truststore, truststorePath, JavaTruststore.class);
- }
-
- private void assertCorrectPemTruststore(Truststore truststore, String truststorePath) {
- assertCorrectTypeAndTruststorePath(truststore, truststorePath, PemTruststore.class);
- }
-
- private void assertCorrectTypeAndTruststorePath(Truststore truststore, String truststorePath, Class<?> truststoreType) {
- assertThat(truststore).isInstanceOf(truststoreType);
- assertThat(truststore.getFile()).isEqualTo(new File(truststorePath));
- }
-
-}
--- /dev/null
+/*============LICENSE_START=======================================================
+ * oom-truststore-merger
+ * ================================================================================
+ * 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.oom.truststoremerger.common;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.IOException;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.onap.oom.truststoremerger.merger.exception.CreateBackupException;
+import org.onap.oom.truststoremerger.merger.model.TestCertificateProvider;
+
+public class BackupCreatorTest {
+
+ public static final String BAK_EXTENSION = ".bak";
+
+ @Test
+ void shouldCreateBackupProvidedFile() throws CreateBackupException {
+ //given
+ File fileToBackup = new File(TestCertificateProvider.PEM_FILE_PATH);
+ String backupFilePath = fileToBackup.getPath() + BAK_EXTENSION;
+ //when
+ BackupCreator.createBackup(fileToBackup);
+ //then
+ assertThat(fileToBackup.equals(new File(backupFilePath)));
+ }
+
+ @AfterEach
+ void removeTemporaryFiles() throws IOException {
+ TestCertificateProvider.removeTemporaryFiles();
+ }
+
+}
*/
-package org.onap.oom.truststoremerger.certification.file.provider;
+package org.onap.oom.truststoremerger.common;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import static org.assertj.core.api.Assertions.assertThat;
-class FileManagerTest {
-
- private FileManager fileManager = new FileManager();
+class ExtensionResolverTest {
@ParameterizedTest
@CsvSource(value = {
"opt/app/truststore:''",
}, delimiter = ':')
void shouldReturnCorrectExtension(String filePath, String expectedExtension) {
- String extension = fileManager.getExtension(new File(filePath));
+ String extension = ExtensionResolver.get(new File(filePath));
assertThat(extension).isEqualTo(expectedExtension);
}
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.provider;
+package org.onap.oom.truststoremerger.common;
import org.junit.jupiter.api.Test;
import java.io.File;
-import org.onap.oom.truststoremerger.certification.file.exception.PasswordReaderException;
+import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@Test
void shouldReturnCorrectPasswordFromFile() throws PasswordReaderException {
- PasswordReader passwordReader = new PasswordReader();
- String fileData = passwordReader.readPassword(new File("src/test/resources/truststore-jks.pass"));
+ String fileData = PasswordReader.readPassword(new File("src/test/resources/truststore-jks.pass"));
assertThat(fileData).isEqualTo("EOyuFbuYDyq_EhpboM72RHua");
}
@Test
void shouldThrowExceptionForNonExistingFile() {
- PasswordReader passwordReader = new PasswordReader();
assertThatExceptionOfType(PasswordReaderException.class)
- .isThrownBy(() -> passwordReader.readPassword(new File("src/test/resources/non-esisting-file.pass")));
+ .isThrownBy(() -> PasswordReader.readPassword(new File("src/test/resources/non-esisting-file.pass")));
}
}
--- /dev/null
+/*============LICENSE_START=======================================================
+ * oom-truststore-merger
+ * ================================================================================
+ * 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.oom.truststoremerger.merger;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Arrays;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import org.onap.oom.truststoremerger.merger.exception.KeystoreInstanceException;
+import org.onap.oom.truststoremerger.merger.exception.LoadTruststoreException;
+import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
+import org.onap.oom.truststoremerger.merger.exception.TruststoreFileFactoryException;
+import org.onap.oom.truststoremerger.merger.model.Truststore;
+import org.onap.oom.truststoremerger.merger.model.TruststoreFactory;
+
+class TruststoreFilesProviderTest {
+
+ private static final String TRUSTSTORE_JKS_PATH = "src/test/resources/truststore-jks.jks";
+ private static final String TRUSTSTORE_JKS_PASS_PATH = "src/test/resources/truststore-jks.pass";
+ private static final String TRUSTSTORE_P12_PATH = "src/test/resources/truststore-p12.p12";
+ private static final String TRUSTSTORE_P12_PASS_PATH = "src/test/resources/truststore-p12.pass";
+ private static final String TRUSTSTORE_PEM_PATH = "src/test/resources/truststore.pem";
+ private static final String EMPTY_PASS_PATH = "";
+
+ @Test
+ void shouldReturnTruststoreFilesList()
+ throws TruststoreFileFactoryException, PasswordReaderException, LoadTruststoreException, KeystoreInstanceException {
+ //given
+ List<String> truststorePaths = Arrays.asList(TRUSTSTORE_JKS_PATH, TRUSTSTORE_P12_PATH, TRUSTSTORE_PEM_PATH);
+ List<String> truststorePasswordPaths = Arrays
+ .asList(TRUSTSTORE_JKS_PASS_PATH, TRUSTSTORE_P12_PASS_PATH, EMPTY_PASS_PATH);
+
+ //when
+ List<Truststore> truststoreFilesList = TruststoreFilesProvider
+ .getTruststoreFiles(truststorePaths, truststorePasswordPaths);
+
+ //then
+ assertThat(truststoreFilesList.size()).isEqualTo(3);
+ TruststoreFactory.create(TRUSTSTORE_JKS_PATH, TRUSTSTORE_JKS_PASS_PATH);
+ TruststoreFactory.create(TRUSTSTORE_P12_PATH, TRUSTSTORE_P12_PASS_PATH);
+ TruststoreFactory.create(TRUSTSTORE_PEM_PATH, EMPTY_PASS_PATH);
+ }
+
+}
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.provider;
+package org.onap.oom.truststoremerger.merger.model;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.onap.oom.truststoremerger.certification.file.TestCertificateProvider.getSampleJksTruststoreFile;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.certification.file.provider.entry.CertificateWithAlias;
-import org.onap.oom.truststoremerger.certification.file.TestCertificateProvider;
-import org.onap.oom.truststoremerger.certification.file.exception.AliasConflictException;
-import org.onap.oom.truststoremerger.certification.file.exception.MissingTruststoreException;
-import org.onap.oom.truststoremerger.certification.file.model.JavaTruststore;
-
-class JavaCertificateStoreControllerTest {
+import org.onap.oom.truststoremerger.merger.exception.AliasConflictException;
+import org.onap.oom.truststoremerger.merger.exception.MissingTruststoreException;
+import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAlias;
+class JavaTruststoreTest {
@Test
void throwExceptionWhenAliasConflictDetected() throws Exception {
//given
- JavaTruststore p12Truststore = TestCertificateProvider.getSampleP12Truststore();
- List<CertificateWithAlias> jksTruststoreCertificates = getSampleJksTruststoreFile().getCertificates();
+ Truststore p12Truststore = TestCertificateProvider.getSampleP12Truststore();
+
+ List<CertificateWithAlias> certificateFromJks = TestCertificateProvider
+ .getSampleJksTruststoreFile().getCertificates();
//when //then
assertThatExceptionOfType(AliasConflictException.class)
- .isThrownBy(() -> p12Truststore.addCertificate(jksTruststoreCertificates));
+ .isThrownBy(() -> p12Truststore.addCertificates(certificateFromJks));
}
-
@Test
void throwExceptionWhenFileNotContainsTruststoreEntry() throws ExitableException {
//given
- JavaTruststore p12Truststore = TestCertificateProvider.getSampleP12Keystore();
+ Truststore p12Truststore = TestCertificateProvider.getSampleP12Keystore();
//when//then
assertThatExceptionOfType(MissingTruststoreException.class)
- .isThrownBy(p12Truststore::getCertificates);
+ .isThrownBy(() -> p12Truststore.getCertificates());
}
}
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.provider;
+package org.onap.oom.truststoremerger.merger.model;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.mockito.Mockito.mock;
import java.io.File;
import java.io.IOException;
+import java.security.KeyStore;
+import java.security.KeyStoreSpi;
import java.security.cert.Certificate;
import java.util.List;
import java.util.stream.Collectors;
import org.junit.jupiter.api.Test;
import org.onap.oom.truststoremerger.api.ExitableException;
-import org.onap.oom.truststoremerger.certification.file.provider.entry.CertificateWithAlias;
-import org.onap.oom.truststoremerger.certification.file.TestCertificateProvider;
-import org.onap.oom.truststoremerger.certification.file.exception.MissingTruststoreException;
-import org.onap.oom.truststoremerger.certification.file.exception.TruststoreDataOperationException;
-import org.onap.oom.truststoremerger.certification.file.model.PemTruststore;
+import org.onap.oom.truststoremerger.merger.exception.MissingTruststoreException;
+import org.onap.oom.truststoremerger.merger.exception.TruststoreDataOperationException;
+import org.onap.oom.truststoremerger.merger.exception.WriteTruststoreFileException;
+import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAlias;
-class PemCertificateControllerTest {
+class PemTruststoreTest {
+
+ private static final int EXPECTED_ONE = 1;
@Test
- void getNotEmptyCertificateListShouldThrowExceptionWhenFileNotContainsCertificate() {
+ void getCertificatesShouldThrowExceptionWhenFileNotContainsCertificate() {
//given
- File emptyPemFile = TestCertificateProvider.getEmptyPemTruststoreFile().getFile();
- PemCertificateController pemCertificateController = new PemCertificateController(emptyPemFile);
+ File emptyPemFile = TestCertificateProvider.getEmptyPemFile();
+ PemTruststore pemCertificate = new PemTruststore(emptyPemFile);
//when//then
assertThatExceptionOfType(MissingTruststoreException.class)
- .isThrownBy(pemCertificateController::getNotEmptyCertificateList);
+ .isThrownBy(pemCertificate::getCertificates);
+ }
+
+ @Test
+ void shouldThrowExceptionWhenCannotSaveFile() {
+ //given
+ KeyStoreSpi keyStoreSpi = mock(KeyStoreSpi.class);
+ KeyStore keyStore = new KeyStore(keyStoreSpi, null, "") {
+ };
+ File pemFile = TestCertificateProvider.getEmptyPemFile();
+ pemFile.setWritable(false);
+ PemTruststore pem = new PemTruststore(pemFile);
+
+ //when. then
+ assertThatExceptionOfType(WriteTruststoreFileException.class)
+ .isThrownBy(pem::saveFile);
}
@Test
void transformToStringInPemFormatShouldCorrectlyTransform() throws ExitableException, IOException {
//given
- PemTruststore pemTruststore = TestCertificateProvider.getSamplePemTruststoreFile();
+ Truststore pemTruststore = TestCertificateProvider.getSamplePemTruststoreFile();
+
List<CertificateWithAlias> wrappedCertificates = pemTruststore.getCertificates();
- File notEmptyPemFile = pemTruststore.getFile();
List<Certificate> certificateList = unWrapCertificate(wrappedCertificates);
- PemCertificateController pemCertificateController = new PemCertificateController(notEmptyPemFile);
- String expected = TestCertificateProvider.getExpectedPemCertificateAsString();
+ File notEmptyPemFile = TestCertificateProvider.getNotEmptyPemFile();
+ PemTruststore pemCertificate = new PemTruststore(notEmptyPemFile);
//when
- String certificateTransformed = pemCertificateController.transformToStringInPemFormat(certificateList);
+ String certificateTransformed = pemCertificate.transformToStringInPemFormat(certificateList);
//then
+ String expected = TestCertificateProvider.getExpectedPemCertificateAsString();
assertThat(certificateTransformed).isEqualTo(expected);
}
void fileNotContainsPemCertificateShouldReturnTrueIfFileNotContainsCertificate()
throws TruststoreDataOperationException {
//given
- File emptyPemFile = TestCertificateProvider.getEmptyPemTruststoreFile().getFile();
- PemCertificateController pemCertificateController = new PemCertificateController(emptyPemFile);
+ File emptyPemFile = TestCertificateProvider.getEmptyPemFile();
+ PemTruststore pemCertificate = new PemTruststore(emptyPemFile);
//when//then
- assertThat(pemCertificateController.isFileWithoutPemCertificate()).isTrue();
+ assertThat(pemCertificate.isFileWithoutPemCertificate()).isTrue();
}
@Test
void fileNotContainsPemCertificateShouldReturnFalseIfFileContainsCertificate()
throws TruststoreDataOperationException {
//given
- File notEmptyPemFile = TestCertificateProvider.getSamplePemTruststoreFile().getFile();
- PemCertificateController pemCertificateController = new PemCertificateController(notEmptyPemFile);
+ File notEmptyPemFile = TestCertificateProvider.getNotEmptyPemFile();
+ PemTruststore pemCertificate = new PemTruststore(notEmptyPemFile);
//when//then
- assertThat(pemCertificateController.isFileWithoutPemCertificate()).isFalse();
+ assertThat(pemCertificate.isFileWithoutPemCertificate()).isFalse();
+ }
+
+ @Test
+ void privateKeyIsSkippedWhileReadingCertificates() throws ExitableException {
+ //given
+ File pemTruststoreFile = TestCertificateProvider.getPemWithPrivateKeyFile();
+ PemTruststore pemCertificate = new PemTruststore(pemTruststoreFile);
+
+ //when
+ List<CertificateWithAlias> certificate = pemCertificate.getCertificates();
+
+ //then
+ assertThat(certificate).hasSize(EXPECTED_ONE);
}
private List<Certificate> unWrapCertificate(List<CertificateWithAlias> certificateWithAliases) {
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file;
+package org.onap.oom.truststoremerger.merger.model;
+
+import static org.onap.oom.truststoremerger.api.CertificateConstants.JKS_TYPE;
+import static org.onap.oom.truststoremerger.api.CertificateConstants.PKCS12_TYPE;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
-import org.onap.oom.truststoremerger.certification.file.exception.KeystoreInstanceException;
-import org.onap.oom.truststoremerger.certification.file.exception.LoadTruststoreException;
-import org.onap.oom.truststoremerger.certification.file.model.JavaTruststore;
-import org.onap.oom.truststoremerger.certification.file.model.PemTruststore;
-import org.onap.oom.truststoremerger.certification.file.provider.JavaCertificateStoreController;
-import org.onap.oom.truststoremerger.certification.file.provider.CertificateStoreControllerFactory;
-import org.onap.oom.truststoremerger.certification.file.provider.PemCertificateController;
+import org.onap.oom.truststoremerger.merger.exception.KeystoreInstanceException;
+import org.onap.oom.truststoremerger.merger.exception.LoadTruststoreException;
+import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
-public class TestCertificateProvider {
+public final class TestCertificateProvider {
public static final String SAMPLE_P12_TRUSTSTORE_FILE_PATH = "src/test/resources/truststore-p12.p12";
- public static final String SAMPLE_P12_TRUSTSTORE_PASSWORD = "88y9v5D8H3SG6bZWRVHDfOAo";
+ public static final String SAMPLE_P12_TRUSTSTORE_PASSWORD_PATH = "src/test/resources/truststore-p12.pass";
public static final String TMP_P12_TRUSTSTORE_FILE_PATH = "src/test/resources/tmp-truststore-p12.p12";
public static final String SAMPLE_P12_KEYSTORE_FILE_PATH = "src/test/resources/keystore.p12";
- public static final String SAMPLE_P12_KEYSTORE_PASSWORD = "Foh49MJNYI7S_pEzE9gvUDSu";
+ public static final String SAMPLE_P12_KEYSTORE_PASSWORD_PATH = "src/test/resources/keystore.pass";
public static final String SAMPLE_JKS_TRUSTSTORE_FILE_PATH = "src/test/resources/truststore-jks.jks";
public static final String SAMPLE_JKS_TRUSTSTORE_UNIQUE_ALIAS_FILE_PATH = "src/test/resources/truststore-jks-uniq.jks";
- public static final String SAMPLE_JKS_TRUSTSTORE_PASSWORD = "EOyuFbuYDyq_EhpboM72RHua";
+ public static final String SAMPLE_JKS_TRUSTSTORE_PASSWORD_PATH = "src/test/resources/truststore-jks.pass";
public static final String TMP_JKS_TRUSTSTORE_FILE_PATH = "src/test/resources/tmp-truststore-jks.jks";
public static final String SAMPLE_PEM_TRUSTSTORE_FILE_PATH = "src/test/resources/truststore.pem";
public static final String TMP_PEM_TRUSTSTORE_FILE_PATH = "src/test/resources/tmp-truststore.pem";
public static final String SAMPLE_PEM_TRUSTSTORE_WITH_PRIVATE_KEY_FILE_PATH = "src/test/resources/truststore-with-private-key.pem";
- private static final CertificateStoreControllerFactory certificateStoreControllerFactory = new CertificateStoreControllerFactory();
+ public static final String PEM_FILE_PATH = "src/test/resources/truststore.pem";
+ public static final String PEM_BACKUP_FILE_PATH = "src/test/resources/truststore.pem.bak";
- public static JavaTruststore getSampleP12Truststore() throws LoadTruststoreException, KeystoreInstanceException {
- return createP12TruststoreInstance(SAMPLE_P12_TRUSTSTORE_FILE_PATH, SAMPLE_P12_TRUSTSTORE_PASSWORD);
+ private TestCertificateProvider() {
}
- public static JavaTruststore getSampleP12Keystore() throws LoadTruststoreException, KeystoreInstanceException {
- return createP12TruststoreInstance(SAMPLE_P12_KEYSTORE_FILE_PATH, SAMPLE_P12_KEYSTORE_PASSWORD);
+ public static Truststore getSampleP12Truststore()
+ throws LoadTruststoreException, KeystoreInstanceException, PasswordReaderException {
+ return createJavaTruststore(SAMPLE_P12_TRUSTSTORE_FILE_PATH, SAMPLE_P12_TRUSTSTORE_PASSWORD_PATH, PKCS12_TYPE);
}
- public static JavaTruststore createTmpP12TruststoreFile()
- throws IOException, LoadTruststoreException, KeystoreInstanceException {
- copyFile(SAMPLE_P12_TRUSTSTORE_FILE_PATH, TMP_P12_TRUSTSTORE_FILE_PATH);
- return createP12TruststoreInstance(TMP_P12_TRUSTSTORE_FILE_PATH, SAMPLE_P12_TRUSTSTORE_PASSWORD);
+ public static Truststore getSampleP12Keystore()
+ throws LoadTruststoreException, KeystoreInstanceException, PasswordReaderException {
+ return createJavaTruststore(SAMPLE_P12_KEYSTORE_FILE_PATH, SAMPLE_P12_KEYSTORE_PASSWORD_PATH, PKCS12_TYPE);
}
- public static JavaTruststore getTmpP12TruststoreFile() throws LoadTruststoreException, KeystoreInstanceException {
- return createP12TruststoreInstance(TMP_P12_TRUSTSTORE_FILE_PATH, SAMPLE_P12_TRUSTSTORE_PASSWORD);
- }
-
- private static JavaTruststore createP12TruststoreInstance(String filePath, String password)
- throws LoadTruststoreException, KeystoreInstanceException {
- File certFile = getFile(filePath);
- JavaCertificateStoreController storeController = certificateStoreControllerFactory
- .createLoadedPkcs12CertificateStoreController(certFile, password);
- return new JavaTruststore(certFile, storeController);
+ public static Truststore createTmpP12TruststoreFile()
+ throws IOException, LoadTruststoreException, KeystoreInstanceException, PasswordReaderException {
+ copyFile(SAMPLE_P12_TRUSTSTORE_FILE_PATH, TMP_P12_TRUSTSTORE_FILE_PATH);
+ return createJavaTruststore(TMP_P12_TRUSTSTORE_FILE_PATH, SAMPLE_P12_TRUSTSTORE_PASSWORD_PATH, PKCS12_TYPE);
}
- public static PemTruststore getSamplePemTruststoreFile() {
+ public static Truststore getSamplePemTruststoreFile() {
return getPemTruststoreInstance(SAMPLE_PEM_TRUSTSTORE_FILE_PATH);
}
- public static PemTruststore getEmptyPemTruststoreFile() {
- return getPemTruststoreInstance(EMPTY_PEM_TRUSTSTORE_FILE_PATH);
- }
-
- public static PemTruststore createEmptyTmpPemTruststoreFile() throws IOException {
+ public static Truststore createEmptyTmpPemTruststoreFile()
+ throws IOException {
copyFile(EMPTY_PEM_TRUSTSTORE_FILE_PATH, TMP_PEM_TRUSTSTORE_FILE_PATH);
return getPemTruststoreInstance(TMP_PEM_TRUSTSTORE_FILE_PATH);
}
- public static PemTruststore createTmpPemTruststoreFile() throws IOException {
+ public static Truststore createTmpPemTruststoreFile()
+ throws IOException {
copyFile(SAMPLE_PEM_TRUSTSTORE_FILE_PATH, TMP_PEM_TRUSTSTORE_FILE_PATH);
return getPemTruststoreInstance(TMP_PEM_TRUSTSTORE_FILE_PATH);
}
- public static PemTruststore getTmpPemTruststoreFile() {
- return getPemTruststoreInstance(TMP_PEM_TRUSTSTORE_FILE_PATH);
- }
-
- public static PemTruststore getPemWithPrivateKeyTruststoreFile() {
- return getPemTruststoreInstance(SAMPLE_PEM_TRUSTSTORE_WITH_PRIVATE_KEY_FILE_PATH);
- }
-
public static String getExpectedPemCertificateAsString() throws IOException {
Path samplePemFilePath = Paths.get(SAMPLE_PEM_TRUSTSTORE_FILE_PATH);
return Files.readString(samplePemFilePath);
}
- public static JavaTruststore getSampleJksTruststoreFile()
- throws LoadTruststoreException, KeystoreInstanceException {
- return createJksTruststoreInstance(SAMPLE_JKS_TRUSTSTORE_FILE_PATH, SAMPLE_JKS_TRUSTSTORE_PASSWORD);
+ public static Truststore getSampleJksTruststoreFile()
+ throws LoadTruststoreException, KeystoreInstanceException, PasswordReaderException {
+ return createJavaTruststore(SAMPLE_JKS_TRUSTSTORE_FILE_PATH, SAMPLE_JKS_TRUSTSTORE_PASSWORD_PATH, JKS_TYPE);
}
- public static JavaTruststore getSampleJksTruststoreFileWithUniqueAlias()
- throws LoadTruststoreException, KeystoreInstanceException {
- return createJksTruststoreInstance(SAMPLE_JKS_TRUSTSTORE_UNIQUE_ALIAS_FILE_PATH,
- SAMPLE_JKS_TRUSTSTORE_PASSWORD);
+ public static Truststore getSampleJksTruststoreFileWithUniqueAlias()
+ throws LoadTruststoreException, KeystoreInstanceException, PasswordReaderException {
+ return createJavaTruststore(SAMPLE_JKS_TRUSTSTORE_UNIQUE_ALIAS_FILE_PATH, SAMPLE_JKS_TRUSTSTORE_PASSWORD_PATH,
+ JKS_TYPE);
}
- public static JavaTruststore createTmpJksTruststoreFileWithUniqAlias()
- throws IOException, LoadTruststoreException, KeystoreInstanceException {
+ public static Truststore createTmpJksTruststoreFileWithUniqAlias()
+ throws IOException, LoadTruststoreException, KeystoreInstanceException, PasswordReaderException {
copyFile(SAMPLE_JKS_TRUSTSTORE_UNIQUE_ALIAS_FILE_PATH, TMP_JKS_TRUSTSTORE_FILE_PATH);
- return createJksTruststoreInstance(TMP_JKS_TRUSTSTORE_FILE_PATH, SAMPLE_JKS_TRUSTSTORE_PASSWORD);
+ return createJavaTruststore(TMP_JKS_TRUSTSTORE_FILE_PATH, SAMPLE_JKS_TRUSTSTORE_PASSWORD_PATH, JKS_TYPE);
+ }
+
+ public static File getEmptyPemFile() {
+ return getFile(EMPTY_PEM_TRUSTSTORE_FILE_PATH);
+ }
+
+ public static File getNotEmptyPemFile() {
+ return getFile(SAMPLE_PEM_TRUSTSTORE_FILE_PATH);
+ }
+
+ public static File getPemWithPrivateKeyFile() {
+ return getFile(SAMPLE_PEM_TRUSTSTORE_WITH_PRIVATE_KEY_FILE_PATH);
}
public static void removeTemporaryFiles() throws IOException {
Files.deleteIfExists(Paths.get(TMP_PEM_TRUSTSTORE_FILE_PATH));
Files.deleteIfExists(Paths.get(TMP_JKS_TRUSTSTORE_FILE_PATH));
Files.deleteIfExists(Paths.get(TMP_P12_TRUSTSTORE_FILE_PATH));
+ Files.deleteIfExists(Paths.get(PEM_BACKUP_FILE_PATH));
}
- private static JavaTruststore createJksTruststoreInstance(String filePath, String password)
- throws LoadTruststoreException, KeystoreInstanceException {
+ private static Truststore createJavaTruststore(String filePath, String password, String instanceType)
+ throws LoadTruststoreException, KeystoreInstanceException, PasswordReaderException {
File certFile = getFile(filePath);
- JavaCertificateStoreController storeController = certificateStoreControllerFactory
- .createLoadedJksCertificateStoreController(certFile, password);
- return new JavaTruststore(certFile, storeController);
+ return JavaTruststoreFactory.create(certFile, password, instanceType);
}
- private static PemTruststore getPemTruststoreInstance(String tmpPemTruststoreFilePath) {
+ private static Truststore getPemTruststoreInstance(
+ String tmpPemTruststoreFilePath) {
File file = getFile(tmpPemTruststoreFilePath);
- return new PemTruststore(file, new PemCertificateController(file));
+ return new PemTruststore(file);
}
private static void copyFile(String sourcePath, String destPath) throws IOException {
*/
-package org.onap.oom.truststoremerger.certification.file.provider;
+package org.onap.oom.truststoremerger.merger.model;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
-import org.onap.oom.truststoremerger.certification.file.TruststoreFileFactory;
-import org.onap.oom.truststoremerger.certification.file.model.JavaTruststore;
-import org.onap.oom.truststoremerger.certification.file.model.PemTruststore;
-import org.onap.oom.truststoremerger.certification.file.model.Truststore;
-import org.onap.oom.truststoremerger.certification.file.exception.KeystoreInstanceException;
-import org.onap.oom.truststoremerger.certification.file.exception.LoadTruststoreException;
-
-import java.io.File;
-import org.onap.oom.truststoremerger.certification.file.exception.PasswordReaderException;
-import org.onap.oom.truststoremerger.certification.file.exception.TruststoreFileFactoryException;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import org.onap.oom.truststoremerger.merger.exception.KeystoreInstanceException;
+import org.onap.oom.truststoremerger.merger.exception.LoadTruststoreException;
+import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
+import org.onap.oom.truststoremerger.merger.exception.TruststoreFileFactoryException;
@ExtendWith(MockitoExtension.class)
class TruststoreFactoryTest {
private static final String TRUSTSTORE_UNKNOWN_EXTENSION_PATH = "src/test/resources/truststore-jks.unknown";
private static final String NON_EXISTING_TRUSTSTORE_PATH = "src/test/resources/non-existing-truststore.jks";
- private TruststoreFileFactory truststoreFileFactory;
-
- @BeforeEach
- void setUp() {
- truststoreFileFactory = new TruststoreFileFactory(new FileManager(), new PasswordReader());
- }
-
@Test
void shouldReturnCorrectJksTruststoreForJksFile()
throws LoadTruststoreException, PasswordReaderException, TruststoreFileFactoryException, KeystoreInstanceException {
- Truststore truststore = truststoreFileFactory
- .create(TRUSTSTORE_JKS_PATH, TRUSTSTORE_JKS_PASS_PATH);
- assertThat(truststore).isInstanceOf(JavaTruststore.class);
- JavaTruststore jksTruststore = (JavaTruststore) truststore;
- assertThat(jksTruststore.getFile()).isEqualTo(new File(TRUSTSTORE_JKS_PATH));
+ //given, when
+ Truststore truststore = TruststoreFactory
+ .create(TRUSTSTORE_JKS_PATH, TRUSTSTORE_JKS_PASS_PATH);
+
+ //then
+ assertThat(truststore).isInstanceOf(Truststore.class);
}
@Test
void shouldReturnCorrectP12TruststoreForP12File()
throws LoadTruststoreException, PasswordReaderException, TruststoreFileFactoryException, KeystoreInstanceException {
- Truststore truststore = truststoreFileFactory
- .create(TRUSTSTORE_P12_PATH,
- TRUSTSTORE_P12_PASS_PATH);
- assertThat(truststore).isInstanceOf(JavaTruststore.class);
+ //given, when
+ Truststore truststore = TruststoreFactory
+ .create(TRUSTSTORE_P12_PATH, TRUSTSTORE_P12_PASS_PATH);
+
+ //then
+ assertThat(truststore).isInstanceOf(Truststore.class);
}
@Test
void shouldReturnCorrectPemTruststoreForPemFile()
throws LoadTruststoreException, PasswordReaderException, TruststoreFileFactoryException, KeystoreInstanceException {
- Truststore truststore = truststoreFileFactory
- .create(TRUSTSTORE_PEM_PATH,
- EMPTY_PASS_PATH);
- assertThat(truststore).isInstanceOf(PemTruststore.class);
+ //given, when
+ Truststore truststore = TruststoreFactory
+ .create(TRUSTSTORE_PEM_PATH,
+ EMPTY_PASS_PATH);
+
+ //then
+ assertThat(truststore).isInstanceOf(Truststore.class);
}
@Test
void shouldThrowExceptionForInvalidP12PassPath() {
assertThatExceptionOfType(PasswordReaderException.class).isThrownBy(
- () -> truststoreFileFactory.create(TRUSTSTORE_P12_PATH, EMPTY_PASS_PATH)
+ () -> TruststoreFactory.create(TRUSTSTORE_P12_PATH, EMPTY_PASS_PATH)
);
}
@Test
void shouldThrowExceptionForInvalidJksPassPath() {
assertThatExceptionOfType(PasswordReaderException.class).isThrownBy(
- () -> truststoreFileFactory.create(TRUSTSTORE_JKS_PATH, EMPTY_PASS_PATH)
+ () -> TruststoreFactory.create(TRUSTSTORE_JKS_PATH, EMPTY_PASS_PATH)
);
}
@Test
void shouldThrowExceptionForUnknownTruststoreExtension() {
assertThatExceptionOfType(TruststoreFileFactoryException.class).isThrownBy(
- () -> truststoreFileFactory.create(TRUSTSTORE_UNKNOWN_EXTENSION_PATH, TRUSTSTORE_JKS_PASS_PATH)
+ () -> TruststoreFactory
+ .create(TRUSTSTORE_UNKNOWN_EXTENSION_PATH, TRUSTSTORE_JKS_PASS_PATH)
);
}
@Test
void shouldThrowExceptionForNonExistingTruststoreFile() {
assertThatExceptionOfType(TruststoreFileFactoryException.class).isThrownBy(
- () -> truststoreFileFactory.create(NON_EXISTING_TRUSTSTORE_PATH, TRUSTSTORE_JKS_PASS_PATH)
+ () -> TruststoreFactory.create(NON_EXISTING_TRUSTSTORE_PATH, TRUSTSTORE_JKS_PASS_PATH)
);
}
--- /dev/null
+/*============LICENSE_START=======================================================
+ * oom-truststore-merger
+ * ================================================================================
+ * 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.oom.truststoremerger.merger.model;
+
+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.oom.truststoremerger.api.CertificateConstants.X_509_CERTIFICATE;
+
+import java.io.File;
+import java.io.IOException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateEncodingException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.onap.oom.truststoremerger.api.ExitableException;
+import org.onap.oom.truststoremerger.merger.exception.CreateBackupException;
+import org.onap.oom.truststoremerger.merger.exception.KeystoreInstanceException;
+import org.onap.oom.truststoremerger.merger.exception.LoadTruststoreException;
+import org.onap.oom.truststoremerger.merger.exception.MissingTruststoreException;
+import org.onap.oom.truststoremerger.merger.exception.PasswordReaderException;
+import org.onap.oom.truststoremerger.merger.exception.TruststoreDataOperationException;
+import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAlias;
+import org.onap.oom.truststoremerger.merger.model.certificate.CertificateWithAliasFactory;
+
+class TruststoreTest {
+
+ private static final String BACKUP_EXTENSION = ".bak";
+
+ private static final int EXPECTED_ONE = 1;
+ public static final int EXPECTED_THREE = 3;
+ public static final int FIRST_ELEMENT = 0;
+
+ private final CertificateWithAliasFactory factory = new CertificateWithAliasFactory();
+
+ @Test
+ void createBackupShouldCreateFileWithExtension() throws CreateBackupException {
+ //given
+ File pemFile = new File(TestCertificateProvider.PEM_FILE_PATH);
+ Truststore truststore = new PemTruststore(pemFile);
+ //when
+ truststore.createBackup();
+
+ //then
+ File backupFile = new File(TestCertificateProvider.PEM_BACKUP_FILE_PATH);
+ assertThat(backupFile.getName().endsWith(BACKUP_EXTENSION)).isTrue();
+ assertThat(backupFile.isFile()).isTrue();
+ }
+
+ @ParameterizedTest
+ @MethodSource("truststoreProvider")
+ void truststoreShouldReadCertificatesFromFile(Truststore truststore) throws ExitableException {
+ //when
+
+ List<CertificateWithAlias> certificates = truststore.getCertificates();
+ Certificate certificate = certificates.get(FIRST_ELEMENT).getCertificate();
+
+ //then
+ assertThat(certificates).hasSize(EXPECTED_ONE);
+ assertThat(certificate.getType()).isEqualTo(X_509_CERTIFICATE);
+ }
+
+ @Test
+ void jksTruststoreShouldAddDifferentCertificates() throws Exception {
+ //given
+ Truststore jksTruststore = TestCertificateProvider.createTmpJksTruststoreFileWithUniqAlias();
+
+ List<CertificateWithAlias> certificateFromP12 = TestCertificateProvider.getSampleP12Truststore()
+ .getCertificates();
+
+ List<CertificateWithAlias> certificateFromPem = TestCertificateProvider
+ .getSamplePemTruststoreFile().getCertificates();
+
+ //when
+
+ jksTruststore.addCertificates(certificateFromP12);
+
+ jksTruststore.addCertificates(certificateFromPem);
+
+ jksTruststore.saveFile();
+
+ //then
+
+ assertThat(jksTruststore.getCertificates()).hasSize(EXPECTED_THREE);
+ }
+
+ @Test
+ void p12TruststoreShouldAddDifferentCertificates() throws Exception {
+ //given
+ Truststore p12Truststore = TestCertificateProvider.createTmpP12TruststoreFile();
+
+ List<CertificateWithAlias> certificateFromJks = TestCertificateProvider
+ .getSampleJksTruststoreFileWithUniqueAlias().getCertificates();
+
+ List<CertificateWithAlias> certificateFromPem = TestCertificateProvider
+ .getSamplePemTruststoreFile().getCertificates();
+
+ //when
+
+ p12Truststore.addCertificates(certificateFromJks);
+ p12Truststore.addCertificates(certificateFromPem);
+ p12Truststore.saveFile();
+
+ //then
+
+ assertThat(p12Truststore.getCertificates()).hasSize(EXPECTED_THREE);
+ }
+
+ @Test
+ void pemTruststoreShouldAddDifferentCertificates() throws IOException, ExitableException {
+ //given
+ Truststore pemTruststore = TestCertificateProvider
+ .createTmpPemTruststoreFile();
+
+ List<CertificateWithAlias> certificateFromJks = TestCertificateProvider
+ .getSampleJksTruststoreFileWithUniqueAlias().getCertificates();
+
+ List<CertificateWithAlias> certificateFromP12 = TestCertificateProvider.getSampleP12Truststore()
+ .getCertificates();
+
+ //when
+
+ pemTruststore.addCertificates(certificateFromJks);
+
+ pemTruststore.addCertificates(certificateFromP12);
+
+ pemTruststore.saveFile();
+
+ //then
+
+ List<CertificateWithAlias> addedCertificates = pemTruststore.getCertificates();
+ Certificate certificate = addedCertificates.get(FIRST_ELEMENT).getCertificate();
+
+ assertThat(pemTruststore.getCertificates()).hasSize(EXPECTED_THREE);
+ assertThat(certificate.getType()).isEqualTo(X_509_CERTIFICATE);
+ }
+
+ @Test
+ void shouldThrowExceptionWhenFileNotContainsCertificate() throws IOException {
+ //given
+ Truststore tmpPemTruststoreFile = TestCertificateProvider
+ .createEmptyTmpPemTruststoreFile();
+ //when//then
+ assertThatExceptionOfType(MissingTruststoreException.class)
+ .isThrownBy(() -> tmpPemTruststoreFile.getCertificates());
+ }
+
+ @Test
+ void shouldThrowExceptionWhenCannotConvertCertificateToPem() throws Exception {
+ //given
+ Truststore pemTruststore = TestCertificateProvider.createTmpPemTruststoreFile();
+ Certificate certificate = mock(Certificate.class);
+
+ when(certificate.getEncoded()).thenThrow(new CertificateEncodingException());
+
+ List<CertificateWithAlias> certificateFromPem = new ArrayList<>();
+ certificateFromPem.add(factory.createPemCertificate(certificate));
+
+ pemTruststore.addCertificates(certificateFromPem);
+
+ //when //then
+ assertThatExceptionOfType(TruststoreDataOperationException.class)
+ .isThrownBy(() -> pemTruststore.saveFile());
+ }
+
+ @AfterEach
+ void removeTemporaryFiles() throws IOException {
+ 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())
+ );
+ }
+
+}
* ============LICENSE_END=========================================================
*/
-package org.onap.oom.truststoremerger.certification.file.provider.entry;
+package org.onap.oom.truststoremerger.merger.model.certificate;
import static org.assertj.core.api.Assertions.assertThat;
--- /dev/null
+Foh49MJNYI7S_pEzE9gvUDSu
\ No newline at end of file
Code Review / oom / platform / cert-service.git / commitdiff