@echo "##### Start Cert Service #####"
docker-compose up -d
@echo "## Configure ejbca ##"
- docker exec aafcert-ejbca /opt/primekey/scripts/ejbca-configuration.sh
+ docker exec oomcert-ejbca /opt/primekey/scripts/ejbca-configuration.sh
@echo "##### DONE #####"
run-client:
@echo "##### Start Cert Service Client #####"
docker run \
--rm \
- --name aafcert-client \
+ --name oomcert-client \
--env-file ./compose-resources/client-configuration.env \
- --network certservice_certservice \
+ --network cert-service_certservice \
--mount type=bind,src=`pwd`/compose-resources/client-volume/,dst=/var/certs \
- --volume `pwd`/certs/truststore.jks:/etc/onap/aaf/certservice/certs/truststore.jks \
- --volume `pwd`/certs/certServiceClient-keystore.jks:/etc/onap/aaf/certservice/certs/certServiceClient-keystore.jks \
- onap/org.onap.aaf.certservice.aaf-certservice-client:latest
+ --volume `pwd`/certs/truststore.jks:/etc/onap/oom/certservice/certs/truststore.jks \
+ --volume `pwd`/certs/certServiceClient-keystore.jks:/etc/onap/oom/certservice/certs/certServiceClient-keystore.jks \
+ onap/org.onap.oom.certservice.oom-certservice-client:latest
stop-backend:
@echo "##### Stop Cert Service #####"
More information about the project and all its functionalities you can find under the wiki page:
```
- https://wiki.onap.org/display/DW/AAF+Certification+Service
+ https://wiki.onap.org/display/DW/OOM+Certification+Service
```
Project consists of two submodules:
-1. aaf-certservice-api
-2. aaf-certservice-client
+1. oom-certservice-api
+2. oom-certservice-client
Detailed information about submodules can be found in ```README.md``` in their directories.
make stop-backend
```
-### AAF CertService CSITs
+### OOM CertService CSITs
#### CSIT repository
```
https://gerrit.onap.org/r/admin/repos/integration/csit
```
####Jenkins build
-https://jenkins.onap.org/view/CSIT/job/aaf-master-csit-certservice/
+https://jenkins.onap.org/view/CSIT/job/oom-platform-cert-service-master-csit-certservice/
### Sonar results
```
### Maven artifacts
All maven artifacts are deployed under nexus uri:
```
-https://nexus.onap.org/content/repositories/snapshots/org/onap/aaf/certservice/
+https://nexus.onap.org/content/repositories/snapshots/org/onap/oom/certservice/
```
### Docker artifacts
All docker images are hosted under nexus3 uri:
```
-https://nexus3.onap.org/repository/docker.snapshot/v2/onap/org.onap.aaf.certservice.aaf-certservice-api/
+https://nexus3.onap.org/repository/docker.snapshot/v2/onap/org.onap.oom.certservice.oom-certservice-api/
```
### How to release containers
USER certService:certService
-COPY target/aaf-certservice-api-${VERSION}.jar ./opt/onap/aaf/certservice/aaf-certservice-api.jar
+COPY target/oom-certservice-api-${VERSION}.jar ./opt/onap/oom/certservice/oom-certservice-api.jar
-ENTRYPOINT ["java","-jar","./opt/onap/aaf/certservice/aaf-certservice-api.jar"]
+ENTRYPOINT ["java","-jar","./opt/onap/oom/certservice/oom-certservice-api.jar"]
### General description
More information about the project and all its functionalities you can find under the wiki page:
```
- https://wiki.onap.org/display/DW/AAF+Certification+Service
+ https://wiki.onap.org/display/DW/OOM+Certification+Service
```
### For developers
- * AAF Cert Service Api is a Spring Boot application
+ * OOM Cert Service Api is a Spring Boot application
* Code style
Use Google code formatter in your IDE.
For IntelliJ use [https://plugins.jetbrains.com/plugin/8527-google-java-format]
For other IDEs use []https://github.com/google/google-java-format]
### Local project configuration
- * Create directory on your system /etc/onap/aaf/certservice
+ * Create directory on your system /etc/onap/oom/certservice
* Copy sample configuration test/resources/cmpServers.json to that directory
### Running Locally
### Building Docker image manually
Go to the certService subfolder and execute following statement (1.0.0-SNAPSHOT is related to a current project.version parameter):
```
-docker build --build-arg VERSION=1.0.0-SNAPSHOT -t onap/org.onap.aaf.certservice.aaf-certservice-api .
+docker build --build-arg VERSION=1.0.0-SNAPSHOT -t onap/org.onap.oom.certservice.oom-certservice-api .
```
### Install the package into the local repository
### Running Docker container local
```
-docker run -p 8080:8080 --name aaf-certservice-api --mount type=bind,source=/<absolute_path>/cmpServers.json,target=/etc/onap/aaf/certservice/cmpServers.json onap/org.onap.aaf.certservice.aaf-certservice-api
+docker run -p 8080:8080 --name oom-certservice-api --mount type=bind,source=/<absolute_path>/cmpServers.json,target=/etc/onap/
+oom/certservice/cmpServers.json onap/org.onap.oom.certservice.oom-certservice-api
```
### Running Docker container from nexus
```
-docker run -p 8080:8080 --name aaf-certservice-api --mount type=bind,source=/<absolute_path>/cmpServers.json,target=/etc/onap/aaf/certservice/cmpServers.json nexus3.onap.org:10001/onap/org.onap.aaf.certservice.aaf-certservice-api:1.0.0
+docker run -p 8080:8080 --name oom-certservice-api --mount type=bind,source=/<absolute_path>/cmpServers.json,target=/etc/onap/oom/certservice/cmpServers.json nexus3.onap.org:10001/onap/org.onap.oom.certservice.oom-certservice-api:1.0.0
```
### Health Check
path:
```
-var/log/onap/aaf/certservice/
+var/log/onap/oom/certservice/
```
### Logs in Docker container
```
-docker exec -it aaf-certservice-api bash
+docker exec -it oom-certservice-api bash
```
path:
```
-cd /var/log/onap/aaf/certservice
+cd /var/log/onap/oom/certservice
```
You should see:
audit.log error.log debug.log
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.onap.aaf.certservice</groupId>
- <artifactId>aaf-certservice</artifactId>
+ <groupId>org.onap.oom.platform.cert-service</groupId>
+ <artifactId>oom-certservice</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <artifactId>aaf-certservice-api</artifactId>
+ <artifactId>oom-certservice-api</artifactId>
<version>1.2.0-SNAPSHOT</version>
- <name>aaf-certservice-api</name>
- <description>AAF Certification Service Api</description>
+ <name>oom-certservice-api</name>
+ <description>OOM Certification Service Api</description>
<packaging>jar</packaging>
<dependencies>
<distributionManagement>
<repository>
<id>ecomp-releases</id>
- <name>AAF Release Repository</name>
+ <name>OOM Release Repository</name>
<url>${nexusproxy}${releaseNexusPath}</url>
</repository>
<snapshotRepository>
<id>ecomp-snapshots</id>
- <name>AAF Snapshot Repository</name>
+ <name>OOM Snapshot Repository</name>
<url>${nexusproxy}${snapshotNexusPath}</url>
</snapshotRepository>
<site>
+++ /dev/null
-/*
- * ============LICENSE_START====================================================
- * org.onap.aaf
- * ===========================================================================
- * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
- *
- * Modifications Copyright (C) 2019 IBM.
- * ===========================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END====================================================
- *
- */
-
-package org.onap.aaf.certservice.cmpv2client.external;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-
-public final class Factory {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(Factory.class);
- private static final KeyPairGenerator KEY_PAIR_GENERATOR;
- private static final SecureRandom SECURE_RANDOM;
- private static final String KEY_ALGORITHM = "RSA";
- private static final int KEY_LENGTH = 2048;
-
- static {
- SECURE_RANDOM = new SecureRandom();
- KeyPairGenerator tempKeygen;
- try {
- tempKeygen = KeyPairGenerator.getInstance(KEY_ALGORITHM);
- tempKeygen.initialize(KEY_LENGTH, SECURE_RANDOM);
- } catch (NoSuchAlgorithmException e) {
- tempKeygen = null;
- LOGGER.error("Given KEY_ALGORITHM is invalid.", e);
- }
- KEY_PAIR_GENERATOR = tempKeygen;
- }
-
- private Factory() {
- }
-
- public static KeyPair generateKeyPair() {
- return KEY_PAIR_GENERATOR.generateKeyPair();
- }
-}
+++ /dev/null
-/*
- * ============LICENSE_START====================================================
- * org.onap.aaf
- * ===========================================================================
- * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
- *
- * Modifications Copyright (C) 2019 IBM.
- * ===========================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END====================================================
- *
- */
-
-package org.onap.aaf.certservice.cmpv2client.external;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x500.style.BCStyle;
-import org.bouncycastle.cert.CertException;
-
-public class Rdn {
-
- private String tag;
- private String value;
- private ASN1ObjectIdentifier aoi;
-
- public String getValue() {
- return value;
- }
-
- public Rdn(final String tag, final String value) throws CertException {
- this.tag = tag;
- this.value = value;
- this.aoi = getAoi(tag);
- }
-
- public Rdn(final String tagValue) throws CertException {
- List<String> tv = parseRdn("=", tagValue);
- this.tag = tv.get(0);
- this.value = tv.get(1);
- this.aoi = getAoi(this.tag);
- }
-
- /**
- * Splits RDN as string by given delimiter, then trims every part.
- *
- * @param splitBy Delimiter which splits value
- * @param value Value to be splitted
- * @return List of splitted and trimmed strings
- */
- static List<String> parseRdn(String splitBy, String value) {
- String[] splitted = value.split(splitBy);
- return Arrays.stream(splitted)
- .map(String::trim)
- .collect(Collectors.toList());
- }
- /**
- * Parse various forms of DNs into appropriate RDNs, which have the ASN1ObjectIdentifier
- *
- * @param delim
- * @param dnString
- * @return
- * @throws CertException
- */
-
- public static List<Rdn> parse(final char delim, final String dnString) throws CertException {
- List<Rdn> lrnd = new ArrayList<>();
- StringBuilder sb = new StringBuilder();
- boolean inQuotes = false;
- for (int i = 0; i < dnString.length(); ++i) {
- char currentCharacter = dnString.charAt(i);
- if (inQuotes) {
- if ('"' == currentCharacter) {
- inQuotes = false;
- } else {
- sb.append(dnString.charAt(i));
- }
- } else {
- if ('"' == currentCharacter) {
- inQuotes = true;
- } else if (delim == currentCharacter) {
- if (sb.length() > 0) {
- lrnd.add(new Rdn(sb.toString()));
- sb.setLength(0);
- }
- } else {
- sb.append(dnString.charAt(i));
- }
- }
- }
- if (sb.indexOf("=") > 0) {
- lrnd.add(new Rdn(sb.toString()));
- }
- return lrnd;
- }
-
- @Override
- public String toString() {
- return tag + '=' + value;
- }
-
- ASN1ObjectIdentifier getAoi() {
- return aoi;
- }
-
- ASN1ObjectIdentifier getAoi(String tag) throws CertException {
- switch (tag.toLowerCase()) {
- case "cn":
- return BCStyle.CN;
- case "c":
- return BCStyle.C;
- case "st":
- return BCStyle.ST;
- case "l":
- return BCStyle.L;
- case "o":
- return BCStyle.O;
- case "ou":
- return BCStyle.OU;
- case "dc":
- return BCStyle.DC;
- case "gn":
- return BCStyle.GIVENNAME;
- case "sn":
- return BCStyle.SN;
- case "email":
- case "e":
- case "emailaddress":
- return BCStyle.EmailAddress;
- case "initials":
- return BCStyle.INITIALS;
- case "pseudonym":
- return BCStyle.PSEUDONYM;
- case "generationqualifier":
- return BCStyle.GENERATION;
- case "serialnumber":
- return BCStyle.SERIALNUMBER;
- default:
- throw new CertException(
- "Unknown ASN1ObjectIdentifier for tag " + tag);
- }
- }
-}
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice;
+package org.onap.oom.certservice;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.api;
+package org.onap.oom.certservice.api;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
-import org.onap.aaf.certservice.certification.CertificationModelFactory;
-import org.onap.aaf.certservice.certification.exception.DecryptionException;
-import org.onap.aaf.certservice.certification.exception.ErrorResponseModel;
-import org.onap.aaf.certservice.certification.model.CertificationModel;
-import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
+import org.onap.oom.certservice.certification.CertificationModelFactory;
+import org.onap.oom.certservice.certification.exception.DecryptionException;
+import org.onap.oom.certservice.certification.exception.ErrorResponseModel;
+import org.onap.oom.certservice.certification.model.CertificationModel;
+import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.api;
+package org.onap.oom.certservice.api;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
-import org.onap.aaf.certservice.certification.configuration.CmpServersConfig;
+import org.onap.oom.certservice.certification.configuration.CmpServersConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.api;
+package org.onap.oom.certservice.api;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
-import org.onap.aaf.certservice.certification.configuration.CmpServersConfig;
-import org.onap.aaf.certservice.certification.configuration.CmpServersConfigLoadingException;
-import org.onap.aaf.certservice.certification.exception.ErrorResponseModel;
+import org.onap.oom.certservice.certification.configuration.CmpServersConfig;
+import org.onap.oom.certservice.certification.configuration.CmpServersConfigLoadingException;
+import org.onap.oom.certservice.certification.exception.ErrorResponseModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.api.advice;
+package org.onap.oom.certservice.api.advice;
-import org.onap.aaf.certservice.api.CertificationController;
-import org.onap.aaf.certservice.certification.exception.Cmpv2ClientAdapterException;
-import org.onap.aaf.certservice.certification.exception.Cmpv2ServerNotFoundException;
-import org.onap.aaf.certservice.certification.exception.CsrDecryptionException;
-import org.onap.aaf.certservice.certification.exception.ErrorResponseModel;
-import org.onap.aaf.certservice.certification.exception.KeyDecryptionException;
-import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
+import org.onap.oom.certservice.api.CertificationController;
+import org.onap.oom.certservice.certification.exception.Cmpv2ClientAdapterException;
+import org.onap.oom.certservice.certification.exception.Cmpv2ServerNotFoundException;
+import org.onap.oom.certservice.certification.exception.CsrDecryptionException;
+import org.onap.oom.certservice.certification.exception.ErrorResponseModel;
+import org.onap.oom.certservice.certification.exception.KeyDecryptionException;
+import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.api.advice;
+package org.onap.oom.certservice.api.advice;
-import org.onap.aaf.certservice.api.ReloadConfigController;
-import org.onap.aaf.certservice.certification.configuration.CmpServersConfigLoadingException;
+import org.onap.oom.certservice.api.ReloadConfigController;
+import org.onap.oom.certservice.certification.configuration.CmpServersConfigLoadingException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.api.configuration;
+package org.onap.oom.certservice.api.configuration;
import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification;
+package org.onap.oom.certservice.certification;
import java.io.InputStream;
import java.security.NoSuchProviderException;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification;
+package org.onap.oom.certservice.certification;
final class CertificationData {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification;
+package org.onap.oom.certservice.certification;
-import org.onap.aaf.certservice.certification.configuration.Cmpv2ServerProvider;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
-import org.onap.aaf.certservice.certification.exception.DecryptionException;
-import org.onap.aaf.certservice.certification.model.CertificationModel;
-import org.onap.aaf.certservice.certification.model.CsrModel;
-import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
+import org.onap.oom.certservice.certification.configuration.Cmpv2ServerProvider;
+import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server;
+import org.onap.oom.certservice.certification.exception.DecryptionException;
+import org.onap.oom.certservice.certification.model.CertificationModel;
+import org.onap.oom.certservice.certification.model.CsrModel;
+import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification;
+package org.onap.oom.certservice.certification;
import org.bouncycastle.openssl.jcajce.JcaMiscPEMGenerator;
import org.bouncycastle.util.io.pem.PemObjectGenerator;
import org.bouncycastle.util.io.pem.PemWriter;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
-import org.onap.aaf.certservice.certification.model.CertificationModel;
-import org.onap.aaf.certservice.certification.model.CsrModel;
-import org.onap.aaf.certservice.cmpv2client.api.CmpClient;
-import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
-import org.onap.aaf.certservice.cmpv2client.model.Cmpv2CertificationModel;
+import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server;
+import org.onap.oom.certservice.certification.model.CertificationModel;
+import org.onap.oom.certservice.certification.model.CsrModel;
+import org.onap.oom.certservice.cmpv2client.api.CmpClient;
+import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
+import org.onap.oom.certservice.cmpv2client.model.Cmpv2CertificationModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification;
+package org.onap.oom.certservice.certification;
import java.util.Base64;
import java.util.Objects;
import org.bouncycastle.pkcs.PKCS10CertificationRequest;
import org.bouncycastle.util.io.pem.PemObject;
-import org.onap.aaf.certservice.certification.exception.CsrDecryptionException;
-import org.onap.aaf.certservice.certification.exception.DecryptionException;
-import org.onap.aaf.certservice.certification.exception.KeyDecryptionException;
-import org.onap.aaf.certservice.certification.model.CsrModel;
+import org.onap.oom.certservice.certification.exception.CsrDecryptionException;
+import org.onap.oom.certservice.certification.exception.DecryptionException;
+import org.onap.oom.certservice.certification.exception.KeyDecryptionException;
+import org.onap.oom.certservice.certification.model.CsrModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification;
+package org.onap.oom.certservice.certification;
import java.io.IOException;
import java.io.StringReader;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification;
+package org.onap.oom.certservice.certification;
import org.bouncycastle.pkcs.PKCS10CertificationRequest;
import org.bouncycastle.util.encoders.DecoderException;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification;
+package org.onap.oom.certservice.certification;
import java.io.IOException;
import java.security.PrivateKey;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification;
+package org.onap.oom.certservice.certification;
import java.io.IOException;
import java.math.BigInteger;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration;
+package org.onap.oom.certservice.certification.configuration;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
-import org.onap.aaf.certservice.cmpv2client.api.CmpClient;
-import org.onap.aaf.certservice.cmpv2client.impl.CmpClientImpl;
+import org.onap.oom.certservice.cmpv2client.api.CmpClient;
+import org.onap.oom.certservice.cmpv2client.impl.CmpClientImpl;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.context.annotation.RequestScope;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration;
+package org.onap.oom.certservice.certification.configuration;
import java.io.File;
import java.util.Collections;
import java.util.List;
import javax.annotation.PostConstruct;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
+import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration;
+package org.onap.oom.certservice.certification.configuration;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.File;
import java.security.InvalidParameterException;
import java.util.List;
-import org.onap.aaf.certservice.certification.configuration.model.CmpServers;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
-import org.onap.aaf.certservice.certification.configuration.validation.Cmpv2ServersConfigurationValidator;
+import org.onap.oom.certservice.certification.configuration.model.CmpServers;
+import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server;
+import org.onap.oom.certservice.certification.configuration.validation.Cmpv2ServersConfigurationValidator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration;
+package org.onap.oom.certservice.certification.configuration;
public class CmpServersConfigLoadingException extends Exception {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration;
+package org.onap.oom.certservice.certification.configuration;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
-import org.onap.aaf.certservice.certification.exception.Cmpv2ServerNotFoundException;
+import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server;
+import org.onap.oom.certservice.certification.exception.Cmpv2ServerNotFoundException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration.model;
+package org.onap.oom.certservice.certification.configuration.model;
import javax.validation.constraints.NotNull;
import org.hibernate.validator.constraints.Length;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration.model;
+package org.onap.oom.certservice.certification.configuration.model;
public enum CaMode {
RA("RA"), CLIENT("Client");
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration.model;
+package org.onap.oom.certservice.certification.configuration.model;
import java.util.List;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration.model;
+package org.onap.oom.certservice.certification.configuration.model;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import org.bouncycastle.asn1.x500.X500Name;
import org.hibernate.validator.constraints.Length;
-import org.onap.aaf.certservice.certification.configuration.validation.constraints.Cmpv2Url;
+import org.onap.oom.certservice.certification.configuration.validation.constraints.Cmpv2Url;
public class Cmpv2Server {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration.validation;
+package org.onap.oom.certservice.certification.configuration.validation;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
+import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration.validation.constraints;
+package org.onap.oom.certservice.certification.configuration.validation.constraints;
import javax.validation.Constraint;
import javax.validation.Payload;
*/
-package org.onap.aaf.certservice.certification.configuration.validation.constraints;
+package org.onap.oom.certservice.certification.configuration.validation.constraints;
-import org.onap.aaf.certservice.certification.configuration.validation.constraints.violations.PortNumberViolation;
-import org.onap.aaf.certservice.certification.configuration.validation.constraints.violations.RequestTypeViolation;
-import org.onap.aaf.certservice.certification.configuration.validation.constraints.violations.UrlServerViolation;
+import org.onap.oom.certservice.certification.configuration.validation.constraints.violations.PortNumberViolation;
+import org.onap.oom.certservice.certification.configuration.validation.constraints.violations.RequestTypeViolation;
+import org.onap.oom.certservice.certification.configuration.validation.constraints.violations.UrlServerViolation;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration.validation.constraints.violations;
+package org.onap.oom.certservice.certification.configuration.validation.constraints.violations;
import java.net.MalformedURLException;
import java.net.URL;
*/
-package org.onap.aaf.certservice.certification.configuration.validation.constraints.violations;
+package org.onap.oom.certservice.certification.configuration.validation.constraints.violations;
import java.net.MalformedURLException;
import java.net.URL;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration.validation.constraints.violations;
+package org.onap.oom.certservice.certification.configuration.validation.constraints.violations;
public interface UrlServerViolation {
boolean validate(String url);
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.exception;
+package org.onap.oom.certservice.certification.exception;
public class Cmpv2ClientAdapterException extends Exception {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.exception;
+package org.onap.oom.certservice.certification.exception;
public class Cmpv2ServerNotFoundException extends RuntimeException {
public Cmpv2ServerNotFoundException(String message) {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.exception;
+package org.onap.oom.certservice.certification.exception;
public class CsrDecryptionException extends DecryptionException {
public CsrDecryptionException(String message, Throwable cause) {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.exception;
+package org.onap.oom.certservice.certification.exception;
public class DecryptionException extends Exception {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.exception;
+package org.onap.oom.certservice.certification.exception;
public class ErrorResponseModel {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.exception;
+package org.onap.oom.certservice.certification.exception;
public class KeyDecryptionException extends DecryptionException {
public KeyDecryptionException(String message, Throwable cause) {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.model;
+package org.onap.oom.certservice.certification.model;
import java.util.Collections;
import java.util.List;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.model;
+package org.onap.oom.certservice.certification.model;
import java.io.IOException;
import java.security.KeyFactory;
import org.bouncycastle.pkcs.PKCS10CertificationRequest;
import org.bouncycastle.util.io.pem.PemObject;
-import org.onap.aaf.certservice.certification.exception.CsrDecryptionException;
-import org.onap.aaf.certservice.certification.exception.DecryptionException;
-import org.onap.aaf.certservice.certification.exception.KeyDecryptionException;
+import org.onap.oom.certservice.certification.exception.CsrDecryptionException;
+import org.onap.oom.certservice.certification.exception.DecryptionException;
+import org.onap.oom.certservice.certification.exception.KeyDecryptionException;
public class CsrModel {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.cmpv2client.api;
+package org.onap.oom.certservice.cmpv2client.api;
import java.util.Date;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
-import org.onap.aaf.certservice.certification.model.CsrModel;
-import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
-import org.onap.aaf.certservice.cmpv2client.model.Cmpv2CertificationModel;
+import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server;
+import org.onap.oom.certservice.certification.model.CsrModel;
+import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
+import org.onap.oom.certservice.cmpv2client.model.Cmpv2CertificationModel;
/**
* This class represent CmpV2Client Interface for obtaining X.509 Digital Certificates in a Public
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.cmpv2client.exceptions;
+package org.onap.oom.certservice.cmpv2client.exceptions;
/**
* The CmpClientException wraps all exceptions occur internally to Cmpv2Client Api code.
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.cmpv2client.exceptions;
+package org.onap.oom.certservice.cmpv2client.exceptions;
public class PkiErrorException extends Exception {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.cmpv2client.impl;
+package org.onap.oom.certservice.cmpv2client.impl;
import java.security.KeyPair;
import java.security.PublicKey;
-import static org.onap.aaf.certservice.cmpv2client.impl.CmpResponseHelper.checkIfCmpResponseContainsError;
-import static org.onap.aaf.certservice.cmpv2client.impl.CmpResponseHelper.getCertFromByteArray;
-import static org.onap.aaf.certservice.cmpv2client.impl.CmpResponseHelper.verifyAndReturnCertChainAndTrustSTore;
-import static org.onap.aaf.certservice.cmpv2client.impl.CmpResponseValidationHelper.checkImplicitConfirm;
-import static org.onap.aaf.certservice.cmpv2client.impl.CmpResponseValidationHelper.verifyPasswordBasedProtection;
-import static org.onap.aaf.certservice.cmpv2client.impl.CmpResponseValidationHelper.verifySignature;
+import static org.onap.oom.certservice.cmpv2client.impl.CmpResponseHelper.checkIfCmpResponseContainsError;
+import static org.onap.oom.certservice.cmpv2client.impl.CmpResponseHelper.getCertFromByteArray;
+import static org.onap.oom.certservice.cmpv2client.impl.CmpResponseHelper.verifyAndReturnCertChainAndTrustSTore;
+import static org.onap.oom.certservice.cmpv2client.impl.CmpResponseValidationHelper.checkImplicitConfirm;
+import static org.onap.oom.certservice.cmpv2client.impl.CmpResponseValidationHelper.verifyPasswordBasedProtection;
+import static org.onap.oom.certservice.cmpv2client.impl.CmpResponseValidationHelper.verifySignature;
import java.io.IOException;
import java.security.cert.CertificateParsingException;
import org.bouncycastle.asn1.cmp.PKIHeader;
import org.bouncycastle.asn1.cmp.PKIMessage;
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.onap.aaf.certservice.certification.configuration.model.CaMode;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
-import org.onap.aaf.certservice.certification.model.CsrModel;
-import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
-import org.onap.aaf.certservice.cmpv2client.api.CmpClient;
-import org.onap.aaf.certservice.cmpv2client.model.Cmpv2CertificationModel;
+import org.onap.oom.certservice.certification.configuration.model.CaMode;
+import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server;
+import org.onap.oom.certservice.certification.model.CsrModel;
+import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
+import org.onap.oom.certservice.cmpv2client.api.CmpClient;
+import org.onap.oom.certservice.cmpv2client.model.Cmpv2CertificationModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.cmpv2client.impl;
+package org.onap.oom.certservice.cmpv2client.impl;
import java.util.ArrayList;
import java.util.List;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.cmpv2client.impl;
+package org.onap.oom.certservice.cmpv2client.impl;
-import static org.onap.aaf.certservice.cmpv2client.impl.CmpUtil.generateProtectedBytes;
+import static org.onap.oom.certservice.cmpv2client.impl.CmpUtil.generateProtectedBytes;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.bouncycastle.asn1.x509.KeyUsage;
import org.bouncycastle.asn1.x509.Time;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
+import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.cmpv2client.impl;
+package org.onap.oom.certservice.cmpv2client.impl;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import org.bouncycastle.asn1.cmp.PKIMessage;
import org.bouncycastle.asn1.x500.X500Name;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
-import org.onap.aaf.certservice.cmpv2client.exceptions.PkiErrorException;
-import org.onap.aaf.certservice.cmpv2client.model.Cmpv2CertificationModel;
+import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
+import org.onap.oom.certservice.cmpv2client.exceptions.PkiErrorException;
+import org.onap.oom.certservice.cmpv2client.model.Cmpv2CertificationModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.cmpv2client.impl;
+package org.onap.oom.certservice.cmpv2client.impl;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
+import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.cmpv2client.impl;
+package org.onap.oom.certservice.cmpv2client.impl;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.bouncycastle.asn1.x500.X500Name;
import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
import org.bouncycastle.asn1.x509.GeneralName;
-import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
+import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.cmpv2client.impl;
+package org.onap.oom.certservice.cmpv2client.impl;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.bouncycastle.asn1.cmp.PKIMessage;
-import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
+import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.cmpv2client.impl;
+package org.onap.oom.certservice.cmpv2client.impl;
-import static org.onap.aaf.certservice.cmpv2client.impl.CmpUtil.createRandomBytes;
-import static org.onap.aaf.certservice.cmpv2client.impl.CmpUtil.createRandomInt;
-import static org.onap.aaf.certservice.cmpv2client.impl.CmpUtil.generatePkiHeader;
+import static org.onap.oom.certservice.cmpv2client.impl.CmpUtil.createRandomBytes;
+import static org.onap.oom.certservice.cmpv2client.impl.CmpUtil.createRandomInt;
+import static org.onap.oom.certservice.cmpv2client.impl.CmpUtil.generatePkiHeader;
import java.security.KeyPair;
import java.util.Date;
import org.bouncycastle.asn1.crmf.ProofOfPossession;
import org.bouncycastle.asn1.x500.X500Name;
import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
+import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
/**
* Implementation of the CmpClient Interface conforming to RFC4210 (Certificate Management Protocol
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.cmpv2client.model;
+package org.onap.oom.certservice.cmpv2client.model;
import java.security.cert.X509Certificate;
import java.util.Collections;
springdoc.show-actuator=true
springdoc.swagger-ui.path=/docs
-# AAF CertService app specific configuration
-app.config.path=/etc/onap/aaf/certservice
+# OOM CertService app specific configuration
+app.config.path=/etc/onap/oom/certservice
# Mutual TLS configuration
server.ssl.enabled=true
server.ssl.client-auth=need
server.port=${HTTPS_PORT:8443}
-server.ssl.key-store=${KEYSTORE_PATH:/etc/onap/aaf/certservice/certs/certServiceServer-keystore.jks}
+server.ssl.key-store=${KEYSTORE_PATH:/etc/onap/oom/certservice/certs/certServiceServer-keystore.jks}
server.ssl.key-store-password=${KEYSTORE_PASSWORD:secret}
-server.ssl.trust-store=${TRUSTSTORE_PATH:/etc/onap/aaf/certservice/certs/truststore.jks}
+server.ssl.trust-store=${TRUSTSTORE_PATH:/etc/onap/oom/certservice/certs/truststore.jks}
server.ssl.trust-store-password=${TRUSTSTORE_PASSWORD:secret}
pattern="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} %highlight{${LOG_LEVEL_PATTERN:-%5p}}{FATAL=red blink, ERROR=red, WARN=yellow bold, INFO=green, DEBUG=green bold, TRACE=blue} %style{${sys:PID}}{magenta} [%15.15t] %style{%-40.40C{1.}}{cyan} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
</Console>
- <RollingFile fileName="var/log/onap/aaf/certservice/error.log" filePattern="logs/error-%d{yyyy-MM-dd}-%i.log" name="ERROR_LOG">
+ <RollingFile fileName="var/log/onap/oom/certservice/error.log" filePattern="logs/error-%d{yyyy-MM-dd}-%i.log" name="ERROR_LOG">
<LevelRangeFilter maxLevel="ERROR" minLevel="ERROR"/>
<PatternLayout pattern="[%d{ISO8601}][%-5p][%-5c] %m%n"/>
<Policies>
<DefaultRolloverStrategy max="10"/>
</RollingFile>
- <RollingFile fileName="var/log/onap/aaf/certservice/debug.log" filePattern="logs/debug-%d{yyyy-MM-dd}-%i.log" name="DEBUG_LOG">
+ <RollingFile fileName="var/log/onap/oom/certservice/debug.log" filePattern="logs/debug-%d{yyyy-MM-dd}-%i.log" name="DEBUG_LOG">
<LevelRangeFilter maxLevel="DEBUG" minLevel="ERROR"/>
<PatternLayout pattern="[%d{ISO8601}][%-5p][%-5c] %m%n"/>
<Policies>
</Policies>
</RollingFile>
- <RollingFile fileName="var/log/onap/aaf/certservice/audit.log" filePattern="logs/audit-%d{yyyy-MM-dd}-%i.log" name="AUDIT_LOG">
+ <RollingFile fileName="var/log/onap/oom/certservice/audit.log" filePattern="logs/audit-%d{yyyy-MM-dd}-%i.log" name="AUDIT_LOG">
<LevelRangeFilter maxLevel="INFO" minLevel="INFO"/>
<PatternLayout pattern="[%d{ISO8601}][%-5p][%-5c] %m%n"/>
<Policies>
+++ /dev/null
-/*
- * ============LICENSE_START=======================================================
- * PROJECT
- * ================================================================================
- * Copyright (C) 2020 Nokia. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.aaf.certservice.cmpv2client.external;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x500.style.BCStyle;
-import org.bouncycastle.cert.CertException;
-import org.junit.jupiter.api.Test;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class RdnTest {
-
- @Test
- void shouldCreateCorrectRdn() throws CertException {
- // given
- final String expectedValue = "ManagmentCA";
- final ASN1ObjectIdentifier expectedAoi = BCStyle.CN;
-
- //when
- Rdn rdn1 = new Rdn("CN=ManagmentCA");
- Rdn rdn2 = new Rdn("CN = ManagmentCA ");
- Rdn rdn3 = new Rdn("CN", "ManagmentCA");
-
- //then
- assertEquals(expectedValue, rdn1.getValue());
- assertEquals(expectedValue, rdn2.getValue());
- assertEquals(expectedValue, rdn3.getValue());
- assertEquals(expectedAoi, rdn1.getAoi());
- assertEquals(expectedAoi, rdn2.getAoi());
- assertEquals(expectedAoi, rdn3.getAoi());
- }
-
- @Test
- void shouldCorrectlySplitAndTrimString() {
- //given
- String value1 = " T = Test";
- List<String> expected1 = Arrays.asList("T", "Test");
-
- String value2 = "This 123 is 99 tested 12345 string";
- List<String> expected2 = Arrays.asList("This", "is 99 tested", "string");
-
- //when
- List<String> actual1 = Rdn.parseRdn("=", value1);
- List<String> actual2 = Rdn.parseRdn("[0-9]{3,}", value2);
-
- //then
- assertEquals(expected1, actual1);
- assertEquals(expected2, actual2);
- }
-
- @Test
- void shouldConvertAoiStringToEnum() throws CertException {
- Rdn rdn = new Rdn("CN", "ManagmentCA");
-
- assertEquals(BCStyle.CN, rdn.getAoi("CN"));
- assertEquals(BCStyle.C, rdn.getAoi("C"));
- assertEquals(BCStyle.ST, rdn.getAoi("ST"));
- assertEquals(BCStyle.L, rdn.getAoi("L"));
- assertEquals(BCStyle.O, rdn.getAoi("O"));
- assertEquals(BCStyle.OU, rdn.getAoi("OU"));
- assertEquals(BCStyle.DC, rdn.getAoi("DC"));
- assertEquals(BCStyle.GIVENNAME, rdn.getAoi("GN"));
- assertEquals(BCStyle.SN, rdn.getAoi("SN"));
- assertEquals(BCStyle.E, rdn.getAoi("E"));
- assertEquals(BCStyle.E, rdn.getAoi("EMAIL"));
- assertEquals(BCStyle.E, rdn.getAoi("EMAILADDRESS"));
- assertEquals(BCStyle.INITIALS, rdn.getAoi("INITIALS"));
- assertEquals(BCStyle.PSEUDONYM, rdn.getAoi("PSEUDONYM"));
- assertEquals(BCStyle.GENERATION, rdn.getAoi("GENERATIONQUALIFIER"));
- assertEquals(BCStyle.SERIALNUMBER, rdn.getAoi("SERIALNUMBER"));
- assertThrows(CertException.class, () -> rdn.getAoi("INVALIDTAG"));
- }
-}
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice;
+package org.onap.oom.certservice;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.api;
+package org.onap.oom.certservice.api;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
-import org.onap.aaf.certservice.certification.CertificationModelFactory;
-import org.onap.aaf.certservice.certification.exception.Cmpv2ClientAdapterException;
-import org.onap.aaf.certservice.certification.exception.Cmpv2ServerNotFoundException;
-import org.onap.aaf.certservice.certification.exception.CsrDecryptionException;
-import org.onap.aaf.certservice.certification.exception.DecryptionException;
-import org.onap.aaf.certservice.certification.exception.KeyDecryptionException;
-import org.onap.aaf.certservice.certification.model.CertificationModel;
-import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
+import org.onap.oom.certservice.certification.CertificationModelFactory;
+import org.onap.oom.certservice.certification.exception.Cmpv2ClientAdapterException;
+import org.onap.oom.certservice.certification.exception.Cmpv2ServerNotFoundException;
+import org.onap.oom.certservice.certification.exception.CsrDecryptionException;
+import org.onap.oom.certservice.certification.exception.DecryptionException;
+import org.onap.oom.certservice.certification.exception.KeyDecryptionException;
+import org.onap.oom.certservice.certification.model.CertificationModel;
+import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.api;
+package org.onap.oom.certservice.api;
import static org.assertj.core.api.Assertions.assertThat;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
-import org.onap.aaf.certservice.certification.configuration.CmpServersConfig;
+import org.onap.oom.certservice.certification.configuration.CmpServersConfig;
import org.springframework.http.HttpStatus;
@ExtendWith(MockitoExtension.class)
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.api;
+package org.onap.oom.certservice.api;
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
-import org.onap.aaf.certservice.certification.configuration.CmpServersConfig;
-import org.onap.aaf.certservice.certification.configuration.CmpServersConfigLoadingException;
+import org.onap.oom.certservice.certification.configuration.CmpServersConfig;
+import org.onap.oom.certservice.certification.configuration.CmpServersConfigLoadingException;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.api.advice;
+package org.onap.oom.certservice.api.advice;
import com.google.gson.Gson;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.certification.exception.Cmpv2ClientAdapterException;
-import org.onap.aaf.certservice.certification.exception.Cmpv2ServerNotFoundException;
-import org.onap.aaf.certservice.certification.exception.CsrDecryptionException;
-import org.onap.aaf.certservice.certification.exception.ErrorResponseModel;
-import org.onap.aaf.certservice.certification.exception.KeyDecryptionException;
-import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
+import org.onap.oom.certservice.certification.exception.Cmpv2ClientAdapterException;
+import org.onap.oom.certservice.certification.exception.Cmpv2ServerNotFoundException;
+import org.onap.oom.certservice.certification.exception.CsrDecryptionException;
+import org.onap.oom.certservice.certification.exception.ErrorResponseModel;
+import org.onap.oom.certservice.certification.exception.KeyDecryptionException;
+import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.api.advice;
+package org.onap.oom.certservice.api.advice;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.certification.configuration.CmpServersConfigLoadingException;
+import org.onap.oom.certservice.certification.configuration.CmpServersConfigLoadingException;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification;
+package org.onap.oom.certservice.certification;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
-import org.onap.aaf.certservice.certification.configuration.Cmpv2ServerProvider;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
-import org.onap.aaf.certservice.certification.exception.Cmpv2ClientAdapterException;
-import org.onap.aaf.certservice.certification.exception.Cmpv2ServerNotFoundException;
-import org.onap.aaf.certservice.certification.exception.CsrDecryptionException;
-import org.onap.aaf.certservice.certification.exception.DecryptionException;
-import org.onap.aaf.certservice.certification.model.CertificationModel;
-import org.onap.aaf.certservice.certification.model.CsrModel;
-import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
+import org.onap.oom.certservice.certification.configuration.Cmpv2ServerProvider;
+import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server;
+import org.onap.oom.certservice.certification.exception.Cmpv2ClientAdapterException;
+import org.onap.oom.certservice.certification.exception.Cmpv2ServerNotFoundException;
+import org.onap.oom.certservice.certification.exception.CsrDecryptionException;
+import org.onap.oom.certservice.certification.exception.DecryptionException;
+import org.onap.oom.certservice.certification.model.CertificationModel;
+import org.onap.oom.certservice.certification.model.CsrModel;
+import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
import java.util.Arrays;
import java.util.Base64;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import static org.onap.aaf.certservice.certification.CertificationData.CA_CERT;
-import static org.onap.aaf.certservice.certification.CertificationData.ENTITY_CERT;
-import static org.onap.aaf.certservice.certification.CertificationData.INTERMEDIATE_CERT;
-import static org.onap.aaf.certservice.certification.CertificationData.EXTRA_CA_CERT;
-import static org.onap.aaf.certservice.certification.TestData.TEST_CSR;
-import static org.onap.aaf.certservice.certification.TestData.TEST_PK;
-import static org.onap.aaf.certservice.certification.TestData.TEST_WRONG_CSR;
-import static org.onap.aaf.certservice.certification.TestData.TEST_WRONG_PEM;
+import static org.onap.oom.certservice.certification.CertificationData.CA_CERT;
+import static org.onap.oom.certservice.certification.CertificationData.ENTITY_CERT;
+import static org.onap.oom.certservice.certification.CertificationData.INTERMEDIATE_CERT;
+import static org.onap.oom.certservice.certification.CertificationData.EXTRA_CA_CERT;
+import static org.onap.oom.certservice.certification.TestData.TEST_CSR;
+import static org.onap.oom.certservice.certification.TestData.TEST_PK;
+import static org.onap.oom.certservice.certification.TestData.TEST_WRONG_CSR;
+import static org.onap.oom.certservice.certification.TestData.TEST_WRONG_PEM;
@ExtendWith(MockitoExtension.class)
class CertificationModelFactoryTest {
/*
* ============LICENSE_START=======================================================
- * AAF Certification Service
+ * OOM Certification Service
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification;
+package org.onap.oom.certservice.certification;
import org.apache.commons.io.IOUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
-import org.onap.aaf.certservice.certification.model.CertificationModel;
-import org.onap.aaf.certservice.certification.model.CsrModel;
-import org.onap.aaf.certservice.cmpv2client.api.CmpClient;
-import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
-import org.onap.aaf.certservice.cmpv2client.model.Cmpv2CertificationModel;
+import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server;
+import org.onap.oom.certservice.certification.model.CertificationModel;
+import org.onap.oom.certservice.certification.model.CsrModel;
+import org.onap.oom.certservice.cmpv2client.api.CmpClient;
+import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
+import org.onap.oom.certservice.cmpv2client.model.Cmpv2CertificationModel;
import java.io.IOException;
import java.io.InputStream;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification;
+package org.onap.oom.certservice.certification;
import org.bouncycastle.util.encoders.Base64;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.certification.CsrModelFactory.StringBase64;
-import org.onap.aaf.certservice.certification.exception.CsrDecryptionException;
-import org.onap.aaf.certservice.certification.exception.DecryptionException;
-import org.onap.aaf.certservice.certification.exception.KeyDecryptionException;
-import org.onap.aaf.certservice.certification.model.CsrModel;
+import org.onap.oom.certservice.certification.CsrModelFactory.StringBase64;
+import org.onap.oom.certservice.certification.exception.CsrDecryptionException;
+import org.onap.oom.certservice.certification.exception.DecryptionException;
+import org.onap.oom.certservice.certification.exception.KeyDecryptionException;
+import org.onap.oom.certservice.certification.model.CsrModel;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.onap.aaf.certservice.certification.TestData.TEST_CSR;
-import static org.onap.aaf.certservice.certification.TestData.TEST_PK;
-import static org.onap.aaf.certservice.certification.TestData.TEST_WRONG_CSR;
-import static org.onap.aaf.certservice.certification.TestData.TEST_WRONG_PEM;
+import static org.onap.oom.certservice.certification.TestData.TEST_CSR;
+import static org.onap.oom.certservice.certification.TestData.TEST_PK;
+import static org.onap.oom.certservice.certification.TestData.TEST_WRONG_CSR;
+import static org.onap.oom.certservice.certification.TestData.TEST_WRONG_PEM;
class CsrModelFactoryTest {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification;
+package org.onap.oom.certservice.certification;
import org.bouncycastle.util.io.pem.PemObject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.certification.exception.DecryptionException;
+import org.onap.oom.certservice.certification.exception.DecryptionException;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.onap.aaf.certservice.certification.TestData.TEST_PEM;
-import static org.onap.aaf.certservice.certification.TestData.TEST_WRONG_PEM;
-import static org.onap.aaf.certservice.certification.TestUtils.pemObjectToString;
+import static org.onap.oom.certservice.certification.TestData.TEST_PEM;
+import static org.onap.oom.certservice.certification.TestData.TEST_WRONG_PEM;
+import static org.onap.oom.certservice.certification.TestUtils.pemObjectToString;
class PemObjectFactoryTest {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification;
+package org.onap.oom.certservice.certification;
import org.bouncycastle.operator.ContentSigner;
import org.bouncycastle.operator.OperatorCreationException;
import org.bouncycastle.pkcs.PKCS10CertificationRequest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.certification.RsaContentSignerBuilder;
-import org.onap.aaf.certservice.certification.exception.DecryptionException;
-import org.onap.aaf.certservice.certification.model.CsrModel;
+import org.onap.oom.certservice.certification.RsaContentSignerBuilder;
+import org.onap.oom.certservice.certification.exception.DecryptionException;
+import org.onap.oom.certservice.certification.model.CsrModel;
import java.io.IOException;
import java.security.PrivateKey;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.onap.aaf.certservice.certification.TestUtils.createCsrModel;
+import static org.onap.oom.certservice.certification.TestUtils.createCsrModel;
class RsaContentSignerBuilderTest {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification;
+package org.onap.oom.certservice.certification;
public final class TestData {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification;
+package org.onap.oom.certservice.certification;
import org.bouncycastle.util.encoders.Base64;
import org.bouncycastle.util.io.pem.PemObject;
import org.bouncycastle.util.io.pem.PemWriter;
-import org.onap.aaf.certservice.certification.exception.DecryptionException;
-import org.onap.aaf.certservice.certification.exception.KeyDecryptionException;
-import org.onap.aaf.certservice.certification.model.CsrModel;
+import org.onap.oom.certservice.certification.exception.DecryptionException;
+import org.onap.oom.certservice.certification.exception.KeyDecryptionException;
+import org.onap.oom.certservice.certification.model.CsrModel;
import java.io.IOException;
import java.io.StringWriter;
-import static org.onap.aaf.certservice.certification.TestData.TEST_CSR;
-import static org.onap.aaf.certservice.certification.TestData.TEST_PK;
+import static org.onap.oom.certservice.certification.TestData.TEST_CSR;
+import static org.onap.oom.certservice.certification.TestData.TEST_PK;
public final class TestUtils {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification;
+package org.onap.oom.certservice.certification;
import org.bouncycastle.cert.X509CertificateHolder;
import org.bouncycastle.cert.X509v3CertificateBuilder;
import org.bouncycastle.pkcs.PKCS10CertificationRequest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.certification.exception.DecryptionException;
-import org.onap.aaf.certservice.certification.model.CsrModel;
+import org.onap.oom.certservice.certification.exception.DecryptionException;
+import org.onap.oom.certservice.certification.model.CsrModel;
import java.io.IOException;
import java.security.PrivateKey;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.onap.aaf.certservice.certification.TestUtils.createCsrModel;
+import static org.onap.oom.certservice.certification.TestUtils.createCsrModel;
public class X509CertificateBuilderTest {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration;
+package org.onap.oom.certservice.certification.configuration;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import org.onap.aaf.certservice.CertServiceApplication;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
+import org.onap.oom.certservice.CertServiceApplication;
+import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration;
+package org.onap.oom.certservice.certification.configuration;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
-import org.onap.aaf.certservice.certification.configuration.model.Authentication;
-import org.onap.aaf.certservice.certification.configuration.model.CaMode;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
+import org.onap.oom.certservice.certification.configuration.model.Authentication;
+import org.onap.oom.certservice.certification.configuration.model.CaMode;
+import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server;
@ExtendWith(MockitoExtension.class)
class CmpServersConfigTest {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration;
+package org.onap.oom.certservice.certification.configuration;
import org.bouncycastle.asn1.x500.X500Name;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
-import org.onap.aaf.certservice.certification.configuration.model.Authentication;
-import org.onap.aaf.certservice.certification.configuration.model.CaMode;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
-import org.onap.aaf.certservice.certification.exception.Cmpv2ServerNotFoundException;
+import org.onap.oom.certservice.certification.configuration.model.Authentication;
+import org.onap.oom.certservice.certification.configuration.model.CaMode;
+import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server;
+import org.onap.oom.certservice.certification.exception.Cmpv2ServerNotFoundException;
import java.util.Collections;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration.validation;
+package org.onap.oom.certservice.certification.configuration.validation;
import org.bouncycastle.asn1.x500.X500Name;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import org.onap.aaf.certservice.CertServiceApplication;
-import org.onap.aaf.certservice.certification.configuration.model.Authentication;
-import org.onap.aaf.certservice.certification.configuration.model.CaMode;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
+import org.onap.oom.certservice.CertServiceApplication;
+import org.onap.oom.certservice.certification.configuration.model.Authentication;
+import org.onap.oom.certservice.certification.configuration.model.CaMode;
+import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
*/
-package org.onap.aaf.certservice.certification.configuration.validation.constraints;
+package org.onap.oom.certservice.certification.configuration.validation.constraints;
import org.junit.jupiter.api.Test;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration.validation.constraints.violations;
+package org.onap.oom.certservice.certification.configuration.validation.constraints.violations;
import org.junit.jupiter.api.Test;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.configuration.validation.constraints.violations;
+package org.onap.oom.certservice.certification.configuration.validation.constraints.violations;
import org.junit.jupiter.api.Test;
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.certification.model;
+package org.onap.oom.certservice.certification.model;
import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
import org.bouncycastle.pkcs.PKCS10CertificationRequest;
import org.bouncycastle.util.io.pem.PemObject;
import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.certification.Pkcs10CertificationRequestFactory;
-import org.onap.aaf.certservice.certification.PemObjectFactory;
-import org.onap.aaf.certservice.certification.exception.CsrDecryptionException;
-import org.onap.aaf.certservice.certification.exception.DecryptionException;
-import org.onap.aaf.certservice.certification.exception.KeyDecryptionException;
+import org.onap.oom.certservice.certification.Pkcs10CertificationRequestFactory;
+import org.onap.oom.certservice.certification.PemObjectFactory;
+import org.onap.oom.certservice.certification.exception.CsrDecryptionException;
+import org.onap.oom.certservice.certification.exception.DecryptionException;
+import org.onap.oom.certservice.certification.exception.KeyDecryptionException;
import java.io.IOException;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import static org.onap.aaf.certservice.certification.TestData.TEST_CSR;
-import static org.onap.aaf.certservice.certification.TestData.TEST_PEM;
-import static org.onap.aaf.certservice.certification.TestData.TEST_PK;
+import static org.onap.oom.certservice.certification.TestData.TEST_CSR;
+import static org.onap.oom.certservice.certification.TestData.TEST_PEM;
+import static org.onap.oom.certservice.certification.TestData.TEST_PK;
class CsrModelTest {
* limitations under the License
*/
-package org.onap.aaf.certservice.cmpv2client;
+package org.onap.oom.certservice.cmpv2client;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import org.onap.aaf.certservice.certification.configuration.model.Authentication;
-import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server;
-import org.onap.aaf.certservice.certification.model.CsrModel;
-import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
-import org.onap.aaf.certservice.cmpv2client.impl.CmpClientImpl;
-import org.onap.aaf.certservice.cmpv2client.model.Cmpv2CertificationModel;
+import org.onap.oom.certservice.certification.configuration.model.Authentication;
+import org.onap.oom.certservice.certification.configuration.model.Cmpv2Server;
+import org.onap.oom.certservice.certification.model.CsrModel;
+import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
+import org.onap.oom.certservice.cmpv2client.impl.CmpClientImpl;
+import org.onap.oom.certservice.cmpv2client.model.Cmpv2CertificationModel;
class Cmpv2ClientTest {
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.cmpv2client.impl;
+package org.onap.oom.certservice.cmpv2client.impl;
import org.bouncycastle.asn1.cmp.CMPCertificate;
import org.bouncycastle.asn1.cmp.CertRepMessage;
import org.bouncycastle.util.io.pem.PemReader;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.cmpv2client.exceptions.CmpClientException;
-import org.onap.aaf.certservice.cmpv2client.model.Cmpv2CertificationModel;
+import org.onap.oom.certservice.cmpv2client.exceptions.CmpClientException;
+import org.onap.oom.certservice.cmpv2client.model.Cmpv2CertificationModel;
import java.io.ByteArrayInputStream;
import java.io.IOException;
-# AAF CertService app specific configuration
+# OOM CertService app specific configuration
app.config.path=./src/test/resources
# Mutual TLS configuration
server.ssl.client-auth=need
server.port=${HTTPS_PORT:8443}
-server.ssl.key-store=${KEYSTORE_PATH:/etc/onap/aaf/certservice/certs/certServiceServer-keystore.jks}
+server.ssl.key-store=${KEYSTORE_PATH:/etc/onap/oom/certservice/certs/certServiceServer-keystore.jks}
server.ssl.key-store-password=${KEYSTORE_PASSWORD:secret}
-server.ssl.trust-store=${TRUSTSTORE_PATH:/etc/onap/aaf/certservice/certs/truststore.jks}
+server.ssl.trust-store=${TRUSTSTORE_PATH:/etc/onap/oom/certservice/certs/truststore.jks}
server.ssl.trust-store-password=${TRUSTSTORE_PASSWORD:secret}
\ No newline at end of file
USER certServiceClient:certServiceClient
-COPY target/aaf-certservice-client-${VERSION}.jar ./opt/onap/aaf/certservice/aaf-certservice-client.jar
+COPY target/oom-certservice-client-${VERSION}.jar ./opt/onap/oom/certservice/oom-certservice-client.jar
-ENTRYPOINT ["java","-jar","./opt/onap/aaf/certservice/aaf-certservice-client.jar"]
+ENTRYPOINT ["java","-jar","./opt/onap/oom/certservice/oom-certservice-client.jar"]
### Nexus container image
```
-nexus3.onap.org:10001/onap/org.onap.aaf.certservice.aaf-certservice-client:latest
+nexus3.onap.org:10001/onap/org.onap.oom.certservice.oom-certservice-client:latest
```
### Running local client application as standalone docker container
path:
```
-var/log/onap/aaf/certservice-client/certservice-client.log
+var/log/onap/oom/certservice-client/certservice-client.log
```
### Logs in Docker container
```
-docker logs aaf-certservice-client
+docker logs oom-certservice-client
```
###Exit codes
```
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>aaf-certservice</artifactId>
- <groupId>org.onap.aaf.certservice</groupId>
+ <artifactId>oom-certservice</artifactId>
+ <groupId>org.onap.oom.platform.cert-service</groupId>
<version>1.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>aaf-certservice-client</artifactId>
+ <artifactId>oom-certservice-client</artifactId>
<version>1.2.0-SNAPSHOT</version>
- <name>aaf-certservice-client</name>
- <description>AAF Certification Service Api Client</description>
+ <name>oom-certservice-client</name>
+ <description>OOM Certification Service Api Client</description>
<packaging>jar</packaging>
<build>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>org.onap.aaf.certservice.client.MainApp</mainClass>
+ <mainClass>org.onap.oom.certservice.client.MainApp</mainClass>
</transformer>
</transformers>
</configuration>
<distributionManagement>
<repository>
<id>ecomp-releases</id>
- <name>AAF Release Repository</name>
+ <name>OOM Release Repository</name>
<url>${nexusproxy}${releaseNexusPath}</url>
</repository>
<snapshotRepository>
<id>ecomp-snapshots</id>
- <name>AAF Snapshot Repository</name>
+ <name>OOM Snapshot Repository</name>
<url>${nexusproxy}${snapshotNexusPath}</url>
</snapshotRepository>
<site>
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client;
+package org.onap.oom.certservice.client;
-import org.onap.aaf.certservice.client.api.ExitStatus;
+import org.onap.oom.certservice.client.api.ExitStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client;
+package org.onap.oom.certservice.client;
-import org.onap.aaf.certservice.client.api.ExitableException;
-import org.onap.aaf.certservice.client.certification.ArtifactsCreatorProvider;
-import org.onap.aaf.certservice.client.certification.CsrFactory;
-import org.onap.aaf.certservice.client.certification.KeyPairFactory;
-import org.onap.aaf.certservice.client.certification.PrivateKeyToPemEncoder;
-import org.onap.aaf.certservice.client.common.Base64Encoder;
-import org.onap.aaf.certservice.client.configuration.EnvsForClient;
-import org.onap.aaf.certservice.client.configuration.EnvsForCsr;
-import org.onap.aaf.certservice.client.configuration.EnvsForTls;
-import org.onap.aaf.certservice.client.configuration.factory.ClientConfigurationFactory;
-import org.onap.aaf.certservice.client.configuration.factory.CsrConfigurationFactory;
-import org.onap.aaf.certservice.client.configuration.factory.SslContextFactory;
-import org.onap.aaf.certservice.client.configuration.model.ClientConfiguration;
-import org.onap.aaf.certservice.client.configuration.model.CsrConfiguration;
-import org.onap.aaf.certservice.client.httpclient.CloseableHttpsClientProvider;
-import org.onap.aaf.certservice.client.httpclient.HttpClient;
-import org.onap.aaf.certservice.client.httpclient.model.CertServiceResponse;
+import org.onap.oom.certservice.client.api.ExitableException;
+import org.onap.oom.certservice.client.certification.ArtifactsCreatorProvider;
+import org.onap.oom.certservice.client.certification.CsrFactory;
+import org.onap.oom.certservice.client.certification.KeyPairFactory;
+import org.onap.oom.certservice.client.certification.PrivateKeyToPemEncoder;
+import org.onap.oom.certservice.client.common.Base64Encoder;
+import org.onap.oom.certservice.client.configuration.EnvsForClient;
+import org.onap.oom.certservice.client.configuration.EnvsForCsr;
+import org.onap.oom.certservice.client.configuration.EnvsForTls;
+import org.onap.oom.certservice.client.configuration.factory.ClientConfigurationFactory;
+import org.onap.oom.certservice.client.configuration.factory.CsrConfigurationFactory;
+import org.onap.oom.certservice.client.configuration.factory.SslContextFactory;
+import org.onap.oom.certservice.client.configuration.model.ClientConfiguration;
+import org.onap.oom.certservice.client.configuration.model.CsrConfiguration;
+import org.onap.oom.certservice.client.httpclient.CloseableHttpsClientProvider;
+import org.onap.oom.certservice.client.httpclient.HttpClient;
+import org.onap.oom.certservice.client.httpclient.model.CertServiceResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.net.ssl.SSLContext;
import java.security.KeyPair;
-import static org.onap.aaf.certservice.client.api.ExitStatus.SUCCESS;
-import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.KEY_SIZE;
-import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.RSA_ENCRYPTION_ALGORITHM;
+import static org.onap.oom.certservice.client.api.ExitStatus.SUCCESS;
+import static org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants.KEY_SIZE;
+import static org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants.RSA_ENCRYPTION_ALGORITHM;
public class CertServiceClient {
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client;
+package org.onap.oom.certservice.client;
public class MainApp {
public static void main(String[] args) {
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.api;
+package org.onap.oom.certservice.client.api;
public enum ExitStatus {
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.api;
+package org.onap.oom.certservice.client.api;
public abstract class ExitableException extends Exception {
public ExitableException(Throwable cause) {
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification;
+package org.onap.oom.certservice.client.certification;
-import org.onap.aaf.certservice.client.certification.conversion.ArtifactsCreator;
-import org.onap.aaf.certservice.client.certification.conversion.ConvertedArtifactsCreatorFactory;
-import org.onap.aaf.certservice.client.certification.conversion.PemArtifactsCreator;
-import org.onap.aaf.certservice.client.certification.writer.CertFileWriter;
+import org.onap.oom.certservice.client.certification.conversion.ArtifactsCreator;
+import org.onap.oom.certservice.client.certification.conversion.ConvertedArtifactsCreatorFactory;
+import org.onap.oom.certservice.client.certification.conversion.PemArtifactsCreator;
+import org.onap.oom.certservice.client.certification.writer.CertFileWriter;
public enum ArtifactsCreatorProvider {
P12("PKCS12") {
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification;
+package org.onap.oom.certservice.client.certification;
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
import org.bouncycastle.asn1.x509.Extension;
import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
import org.bouncycastle.pkcs.PKCS10CertificationRequest;
import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder;
-import org.onap.aaf.certservice.client.certification.exception.CsrGenerationException;
-import org.onap.aaf.certservice.client.configuration.model.CsrConfiguration;
+import org.onap.oom.certservice.client.certification.exception.CsrGenerationException;
+import org.onap.oom.certservice.client.configuration.model.CsrConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.security.KeyPair;
import java.util.Optional;
-import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.COMMON_NAME;
-import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.COUNTRY;
-import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.LOCATION;
-import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.ORGANIZATION;
-import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.ORGANIZATION_UNIT;
-import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.SIGN_ALGORITHM;
-import static org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants.STATE;
+import static org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants.COMMON_NAME;
+import static org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants.COUNTRY;
+import static org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants.LOCATION;
+import static org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants.ORGANIZATION;
+import static org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants.ORGANIZATION_UNIT;
+import static org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants.SIGN_ALGORITHM;
+import static org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants.STATE;
public class CsrFactory {
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification;
+package org.onap.oom.certservice.client.certification;
public final class EncryptionAlgorithmConstants {
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification;
+package org.onap.oom.certservice.client.certification;
-import org.onap.aaf.certservice.client.certification.exception.KeyPairGenerationException;
+import org.onap.oom.certservice.client.certification.exception.KeyPairGenerationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification;
+package org.onap.oom.certservice.client.certification;
import org.bouncycastle.openssl.jcajce.JcaPEMWriter;
import org.bouncycastle.util.io.pem.PemObject;
-import org.onap.aaf.certservice.client.certification.exception.PkEncodingException;
+import org.onap.oom.certservice.client.certification.exception.PkEncodingException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.conversion;
+package org.onap.oom.certservice.client.certification.conversion;
-import org.onap.aaf.certservice.client.api.ExitableException;
+import org.onap.oom.certservice.client.api.ExitableException;
import java.security.PrivateKey;
import java.util.List;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.conversion;
+package org.onap.oom.certservice.client.certification.conversion;
-import org.onap.aaf.certservice.client.certification.exception.CertFileWriterException;
-import org.onap.aaf.certservice.client.certification.exception.PemConversionException;
-import org.onap.aaf.certservice.client.certification.writer.CertFileWriter;
+import org.onap.oom.certservice.client.certification.exception.CertFileWriterException;
+import org.onap.oom.certservice.client.certification.exception.PemConversionException;
+import org.onap.oom.certservice.client.certification.writer.CertFileWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.conversion;
+package org.onap.oom.certservice.client.certification.conversion;
-import org.onap.aaf.certservice.client.certification.writer.CertFileWriter;
+import org.onap.oom.certservice.client.certification.writer.CertFileWriter;
public class ConvertedArtifactsCreatorFactory {
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.conversion;
+package org.onap.oom.certservice.client.certification.conversion;
class Password {
// We are excluding this line in Sonar due to fact that
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.conversion;
+package org.onap.oom.certservice.client.certification.conversion;
-import org.onap.aaf.certservice.client.certification.PrivateKeyToPemEncoder;
-import org.onap.aaf.certservice.client.certification.exception.CertFileWriterException;
-import org.onap.aaf.certservice.client.certification.exception.PkEncodingException;
-import org.onap.aaf.certservice.client.certification.writer.CertFileWriter;
+import org.onap.oom.certservice.client.certification.PrivateKeyToPemEncoder;
+import org.onap.oom.certservice.client.certification.exception.CertFileWriterException;
+import org.onap.oom.certservice.client.certification.exception.PkEncodingException;
+import org.onap.oom.certservice.client.certification.writer.CertFileWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.conversion;
+package org.onap.oom.certservice.client.certification.conversion;
import org.bouncycastle.cert.X509CertificateHolder;
import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.openssl.PEMParser;
-import org.onap.aaf.certservice.client.certification.exception.PemConversionException;
+import org.onap.oom.certservice.client.certification.exception.PemConversionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.conversion;
+package org.onap.oom.certservice.client.certification.conversion;
import org.apache.commons.lang3.RandomStringUtils;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.conversion;
+package org.onap.oom.certservice.client.certification.conversion;
import java.io.IOException;
import java.security.KeyStore;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.exception;
+package org.onap.oom.certservice.client.certification.exception;
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
+import org.onap.oom.certservice.client.api.ExitStatus;
+import org.onap.oom.certservice.client.api.ExitableException;
public class CertFileWriterException extends ExitableException {
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.exception;
+package org.onap.oom.certservice.client.certification.exception;
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
+import org.onap.oom.certservice.client.api.ExitStatus;
+import org.onap.oom.certservice.client.api.ExitableException;
public class CsrGenerationException extends ExitableException {
private static final ExitStatus EXIT_STATUS = ExitStatus.CSR_GENERATION_EXCEPTION;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.exception;
+package org.onap.oom.certservice.client.certification.exception;
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
+import org.onap.oom.certservice.client.api.ExitStatus;
+import org.onap.oom.certservice.client.api.ExitableException;
public class KeyPairGenerationException extends ExitableException {
private static final ExitStatus EXIT_STATUS = ExitStatus.KEY_PAIR_GENERATION_EXCEPTION;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.exception;
+package org.onap.oom.certservice.client.certification.exception;
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
+import org.onap.oom.certservice.client.api.ExitStatus;
+import org.onap.oom.certservice.client.api.ExitableException;
public class PemConversionException extends ExitableException {
private static final ExitStatus EXIT_STATUS = ExitStatus.PEM_CONVERSION_EXCEPTION;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.exception;
+package org.onap.oom.certservice.client.certification.exception;
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
+import org.onap.oom.certservice.client.api.ExitStatus;
+import org.onap.oom.certservice.client.api.ExitableException;
public class PkEncodingException extends ExitableException {
private static final ExitStatus EXIT_STATUS = ExitStatus.PK_TO_PEM_ENCODING_EXCEPTION;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.writer;
+package org.onap.oom.certservice.client.certification.writer;
-import org.onap.aaf.certservice.client.certification.exception.CertFileWriterException;
+import org.onap.oom.certservice.client.certification.exception.CertFileWriterException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.common;
+package org.onap.oom.certservice.client.common;
import org.bouncycastle.util.encoders.Base64;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration;
+package org.onap.oom.certservice.client.configuration;
public enum ClientConfigurationEnvs {
REQUEST_URL,
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration;
+package org.onap.oom.certservice.client.configuration;
public enum CsrConfigurationEnvs {
COMMON_NAME,
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration;
+package org.onap.oom.certservice.client.configuration;
import java.util.Optional;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration;
+package org.onap.oom.certservice.client.configuration;
import java.util.Optional;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration;
+package org.onap.oom.certservice.client.configuration;
import java.util.Optional;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration;
+package org.onap.oom.certservice.client.configuration;
import java.util.Optional;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration;
+package org.onap.oom.certservice.client.configuration;
public enum TlsConfigurationEnvs {
KEYSTORE_PATH,
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration.exception;
+package org.onap.oom.certservice.client.configuration.exception;
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
+import org.onap.oom.certservice.client.api.ExitStatus;
+import org.onap.oom.certservice.client.api.ExitableException;
public class ClientConfigurationException extends ExitableException {
private static final ExitStatus EXIT_STATUS = ExitStatus.CLIENT_CONFIGURATION_EXCEPTION;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration.exception;
+package org.onap.oom.certservice.client.configuration.exception;
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
+import org.onap.oom.certservice.client.api.ExitStatus;
+import org.onap.oom.certservice.client.api.ExitableException;
public class CsrConfigurationException extends ExitableException {
private static final ExitStatus EXIT_STATUS = ExitStatus.CSR_CONFIGURATION_EXCEPTION;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration.exception;
+package org.onap.oom.certservice.client.configuration.exception;
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
+import org.onap.oom.certservice.client.api.ExitStatus;
+import org.onap.oom.certservice.client.api.ExitableException;
public class TlsConfigurationException extends ExitableException {
private static final ExitStatus EXIT_STATUS = ExitStatus.TLS_CONFIGURATION_EXCEPTION;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration.factory;
+package org.onap.oom.certservice.client.configuration.factory;
-import org.onap.aaf.certservice.client.certification.ArtifactsCreatorProvider;
-import org.onap.aaf.certservice.client.configuration.exception.ClientConfigurationException;
-import org.onap.aaf.certservice.client.configuration.exception.CsrConfigurationException;
-import org.onap.aaf.certservice.client.configuration.model.ConfigurationModel;
+import org.onap.oom.certservice.client.certification.ArtifactsCreatorProvider;
+import org.onap.oom.certservice.client.configuration.exception.ClientConfigurationException;
+import org.onap.oom.certservice.client.configuration.exception.CsrConfigurationException;
+import org.onap.oom.certservice.client.configuration.model.ConfigurationModel;
import java.util.Arrays;
import java.util.Locale;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration.factory;
+package org.onap.oom.certservice.client.configuration.factory;
-import org.onap.aaf.certservice.client.configuration.ClientConfigurationEnvs;
-import org.onap.aaf.certservice.client.configuration.EnvsForClient;
-import org.onap.aaf.certservice.client.configuration.exception.ClientConfigurationException;
-import org.onap.aaf.certservice.client.configuration.model.ClientConfiguration;
+import org.onap.oom.certservice.client.configuration.ClientConfigurationEnvs;
+import org.onap.oom.certservice.client.configuration.EnvsForClient;
+import org.onap.oom.certservice.client.configuration.exception.ClientConfigurationException;
+import org.onap.oom.certservice.client.configuration.model.ClientConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration.factory;
+package org.onap.oom.certservice.client.configuration.factory;
-import org.onap.aaf.certservice.client.configuration.CsrConfigurationEnvs;
-import org.onap.aaf.certservice.client.configuration.EnvsForCsr;
-import org.onap.aaf.certservice.client.configuration.exception.CsrConfigurationException;
-import org.onap.aaf.certservice.client.configuration.model.CsrConfiguration;
+import org.onap.oom.certservice.client.configuration.CsrConfigurationEnvs;
+import org.onap.oom.certservice.client.configuration.EnvsForCsr;
+import org.onap.oom.certservice.client.configuration.exception.CsrConfigurationException;
+import org.onap.oom.certservice.client.configuration.model.CsrConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration.factory;
+package org.onap.oom.certservice.client.configuration.factory;
import org.apache.http.ssl.SSLContexts;
-import org.onap.aaf.certservice.client.configuration.EnvsForTls;
-import org.onap.aaf.certservice.client.configuration.TlsConfigurationEnvs;
-import org.onap.aaf.certservice.client.configuration.exception.TlsConfigurationException;
+import org.onap.oom.certservice.client.configuration.EnvsForTls;
+import org.onap.oom.certservice.client.configuration.TlsConfigurationEnvs;
+import org.onap.oom.certservice.client.configuration.exception.TlsConfigurationException;
import javax.net.ssl.SSLContext;
import java.io.File;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration.model;
+package org.onap.oom.certservice.client.configuration.model;
-import org.onap.aaf.certservice.client.configuration.ClientConfigurationEnvs;
+import org.onap.oom.certservice.client.configuration.ClientConfigurationEnvs;
public class ClientConfiguration implements ConfigurationModel {
private static final Integer DEFAULT_TIMEOUT_MS = 30000;
- private static final String DEFAULT_REQUEST_URL = "https://aaf-cert-service:8443/v1/certificate/";
+ private static final String DEFAULT_REQUEST_URL = "https://oom-cert-service:8443/v1/certificate/";
private static final String DEFAULT_OUTPUT_TYPE = "P12";
private String urlToCertService;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration.model;
+package org.onap.oom.certservice.client.configuration.model;
public interface ConfigurationModel {
}
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration.model;
+package org.onap.oom.certservice.client.configuration.model;
-import org.onap.aaf.certservice.client.configuration.CsrConfigurationEnvs;
+import org.onap.oom.certservice.client.configuration.CsrConfigurationEnvs;
public class CsrConfiguration implements ConfigurationModel {
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.httpclient;
+package org.onap.oom.certservice.client.httpclient;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.impl.client.CloseableHttpClient;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.httpclient;
+package org.onap.oom.certservice.client.httpclient;
import com.google.gson.Gson;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.util.EntityUtils;
-import org.onap.aaf.certservice.client.httpclient.exception.CertServiceApiResponseException;
-import org.onap.aaf.certservice.client.httpclient.exception.HttpClientException;
-import org.onap.aaf.certservice.client.httpclient.model.CertServiceResponse;
-import org.onap.aaf.certservice.client.httpclient.model.ErrorCertServiceResponse;
+import org.onap.oom.certservice.client.httpclient.exception.CertServiceApiResponseException;
+import org.onap.oom.certservice.client.httpclient.exception.HttpClientException;
+import org.onap.oom.certservice.client.httpclient.model.CertServiceResponse;
+import org.onap.oom.certservice.client.httpclient.model.ErrorCertServiceResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.httpclient.exception;
+package org.onap.oom.certservice.client.httpclient.exception;
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
+import org.onap.oom.certservice.client.api.ExitStatus;
+import org.onap.oom.certservice.client.api.ExitableException;
public class CertServiceApiResponseException extends ExitableException {
private static final ExitStatus EXIT_STATUS = ExitStatus.CERT_SERVICE_API_CONNECTION_EXCEPTION;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.httpclient.exception;
+package org.onap.oom.certservice.client.httpclient.exception;
-import org.onap.aaf.certservice.client.api.ExitStatus;
-import org.onap.aaf.certservice.client.api.ExitableException;
+import org.onap.oom.certservice.client.api.ExitStatus;
+import org.onap.oom.certservice.client.api.ExitableException;
public class HttpClientException extends ExitableException {
private static final ExitStatus EXIT_STATUS = ExitStatus.HTTP_CLIENT_EXCEPTION;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.httpclient.model;
+package org.onap.oom.certservice.client.httpclient.model;
import java.util.Collections;
import java.util.List;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.httpclient.model;
+package org.onap.oom.certservice.client.httpclient.model;
public class ErrorCertServiceResponse {
pattern="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} %highlight{${LOG_LEVEL_PATTERN:-%5p}}{FATAL=red blink, ERROR=red, WARN=yellow bold, INFO=green, DEBUG=green bold, TRACE=blue} %style{%pid}{magenta} [%15.15t] %style{%-40.40C{1.}}{cyan} : %m%n%throwable"/>
</Console>
- <RollingFile fileName="var/log/onap/aaf/certservice-client/certservice-client.log"
+ <RollingFile fileName="var/log/onap/oom/certservice-client/certservice-client.log"
filePattern="logs/certservice-client-%d{yyyy-MM-dd}-%i.log" name="ROLLING_FILE">
<PatternLayout pattern="[%d{ISO8601}][%-5p][%-5c] %m%n"/>
<Policies>
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client;
+package org.onap.oom.certservice.client;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client;
+package org.onap.oom.certservice.client;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.verify;
-import static org.onap.aaf.certservice.client.api.ExitStatus.CLIENT_CONFIGURATION_EXCEPTION;
-import static org.onap.aaf.certservice.client.api.ExitStatus.SUCCESS;
+import static org.onap.oom.certservice.client.api.ExitStatus.CLIENT_CONFIGURATION_EXCEPTION;
+import static org.onap.oom.certservice.client.api.ExitStatus.SUCCESS;
@ExtendWith(MockitoExtension.class)
class CertServiceClientTest {
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification;
+package org.onap.oom.certservice.client.certification;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.ValueSource;
-import org.onap.aaf.certservice.client.certification.conversion.ArtifactsCreator;
-import org.onap.aaf.certservice.client.certification.conversion.ConvertedArtifactsCreator;
-import org.onap.aaf.certservice.client.certification.conversion.PemArtifactsCreator;
+import org.onap.oom.certservice.client.certification.conversion.ArtifactsCreator;
+import org.onap.oom.certservice.client.certification.conversion.ConvertedArtifactsCreator;
+import org.onap.oom.certservice.client.certification.conversion.PemArtifactsCreator;
import static org.assertj.core.api.Assertions.assertThat;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification;
+package org.onap.oom.certservice.client.certification;
import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.client.certification.exception.CsrGenerationException;
-import org.onap.aaf.certservice.client.certification.exception.KeyPairGenerationException;
-import org.onap.aaf.certservice.client.configuration.model.CsrConfiguration;
+import org.onap.oom.certservice.client.certification.exception.CsrGenerationException;
+import org.onap.oom.certservice.client.certification.exception.KeyPairGenerationException;
+import org.onap.oom.certservice.client.configuration.model.CsrConfiguration;
import java.security.KeyPair;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification;
+package org.onap.oom.certservice.client.certification;
import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.client.certification.exception.KeyPairGenerationException;
+import org.onap.oom.certservice.client.certification.exception.KeyPairGenerationException;
import java.security.KeyPair;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification;
+package org.onap.oom.certservice.client.certification;
import org.bouncycastle.util.io.pem.PemObject;
import org.bouncycastle.util.io.pem.PemReader;
import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.client.certification.exception.PkEncodingException;
+import org.onap.oom.certservice.client.certification.exception.PkEncodingException;
import java.io.IOException;
import java.io.StringReader;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.conversion;
+package org.onap.oom.certservice.client.certification.conversion;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.client.certification.exception.CertFileWriterException;
-import org.onap.aaf.certservice.client.certification.exception.PemConversionException;
-import org.onap.aaf.certservice.client.certification.writer.CertFileWriter;
+import org.onap.oom.certservice.client.certification.exception.CertFileWriterException;
+import org.onap.oom.certservice.client.certification.exception.PemConversionException;
+import org.onap.oom.certservice.client.certification.writer.CertFileWriter;
import java.security.PrivateKey;
import java.util.List;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.conversion;
+package org.onap.oom.certservice.client.certification.conversion;
import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.client.api.ExitableException;
-import org.onap.aaf.certservice.client.certification.PrivateKeyToPemEncoder;
-import org.onap.aaf.certservice.client.certification.writer.CertFileWriter;
+import org.onap.oom.certservice.client.api.ExitableException;
+import org.onap.oom.certservice.client.certification.PrivateKeyToPemEncoder;
+import org.onap.oom.certservice.client.certification.writer.CertFileWriter;
import java.security.PrivateKey;
import java.util.List;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.conversion;
+package org.onap.oom.certservice.client.certification.conversion;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
-import org.onap.aaf.certservice.client.certification.EncryptionAlgorithmConstants;
-import org.onap.aaf.certservice.client.certification.exception.PemConversionException;
+import org.onap.oom.certservice.client.certification.EncryptionAlgorithmConstants;
+import org.onap.oom.certservice.client.certification.exception.PemConversionException;
import java.io.ByteArrayInputStream;
import java.io.IOException;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.conversion;
+package org.onap.oom.certservice.client.certification.conversion;
import org.junit.jupiter.api.Test;
/*============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.certification.writer;
+package org.onap.oom.certservice.client.certification.writer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
-import org.onap.aaf.certservice.client.certification.exception.CertFileWriterException;
+import org.onap.oom.certservice.client.certification.exception.CertFileWriterException;
import java.io.File;
import java.io.IOException;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration;
+package org.onap.oom.certservice.client.configuration;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration;
+package org.onap.oom.certservice.client.configuration;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration;
+package org.onap.oom.certservice.client.configuration;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration.exception;
+package org.onap.oom.certservice.client.configuration.exception;
import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.client.api.ExitStatus;
+import org.onap.oom.certservice.client.api.ExitStatus;
import static org.assertj.core.api.Assertions.assertThat;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration.factory;
+package org.onap.oom.certservice.client.configuration.factory;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration.factory;
+package org.onap.oom.certservice.client.configuration.factory;
import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.client.configuration.ClientConfigurationEnvs;
-import org.onap.aaf.certservice.client.configuration.EnvsForClient;
-import org.onap.aaf.certservice.client.configuration.exception.ClientConfigurationException;
-import org.onap.aaf.certservice.client.configuration.model.ClientConfiguration;
+import org.onap.oom.certservice.client.configuration.ClientConfigurationEnvs;
+import org.onap.oom.certservice.client.configuration.EnvsForClient;
+import org.onap.oom.certservice.client.configuration.exception.ClientConfigurationException;
+import org.onap.oom.certservice.client.configuration.model.ClientConfiguration;
import java.util.Optional;
public class ClientConfigurationFactoryTest {
- private static final String CA_NAME_VALID = "caaaftest2";
+ private static final String CA_NAME_VALID = "catest2";
private static final String TIME_OUT_VALID = "30000";
- private static final String OUTPUT_PATH_VALID = "/opt/app/osaaf";
+ private static final String OUTPUT_PATH_VALID = "/opt/app/oom";
private static final String URL_TO_CERT_SERVICE_VALID = "https://cert-service:8443/v1/certificate/";
- private static final String URL_TO_CERT_SERVICE_DEFAULT = "https://aaf-cert-service:8443/v1/certificate/";
- private static final String CA_NAME_INVALID = "caaaftest2#$";
- private static final String OUTPUT_PATH_INVALID = "/opt//app/osaaf";
+ private static final String URL_TO_CERT_SERVICE_DEFAULT = "https://oom-cert-service:8443/v1/certificate/";
+ private static final String CA_NAME_INVALID = "catest2#$";
+ private static final String OUTPUT_PATH_INVALID = "/opt//app/oom";
private static final String OUTPUT_TYPE_VALID = "JKS";
private static final String OUTPUT_TYPE_INVALID = "JKSS";
private static final String OUTPUT_TYPE_DEFAULT = "P12";
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration.factory;
+package org.onap.oom.certservice.client.configuration.factory;
import org.assertj.core.api.Condition;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.client.configuration.CsrConfigurationEnvs;
-import org.onap.aaf.certservice.client.configuration.EnvsForCsr;
-import org.onap.aaf.certservice.client.configuration.exception.CsrConfigurationException;
-import org.onap.aaf.certservice.client.configuration.model.CsrConfiguration;
+import org.onap.oom.certservice.client.configuration.CsrConfigurationEnvs;
+import org.onap.oom.certservice.client.configuration.EnvsForCsr;
+import org.onap.oom.certservice.client.configuration.exception.CsrConfigurationException;
+import org.onap.oom.certservice.client.configuration.model.CsrConfiguration;
import java.util.Optional;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import static org.onap.aaf.certservice.client.api.ExitStatus.CSR_CONFIGURATION_EXCEPTION;
+import static org.onap.oom.certservice.client.api.ExitStatus.CSR_CONFIGURATION_EXCEPTION;
public class CsrConfigurationFactoryTest {
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.configuration.factory;
+package org.onap.oom.certservice.client.configuration.factory;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
-import org.onap.aaf.certservice.client.configuration.EnvsForTls;
-import org.onap.aaf.certservice.client.configuration.exception.TlsConfigurationException;
+import org.onap.oom.certservice.client.configuration.EnvsForTls;
+import org.onap.oom.certservice.client.configuration.exception.TlsConfigurationException;
import javax.net.ssl.SSLContext;
import java.util.Optional;
/*
* ============LICENSE_START=======================================================
- * aaf-certservice-client
+ * oom-certservice-client
* ================================================================================
* Copyright (C) 2020 Nokia. All rights reserved.
* ================================================================================
* ============LICENSE_END=========================================================
*/
-package org.onap.aaf.certservice.client.httpclient;
+package org.onap.oom.certservice.client.httpclient;
import org.apache.http.HttpEntity;
import org.apache.http.StatusLine;
import org.apache.http.impl.client.CloseableHttpClient;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.onap.aaf.certservice.client.httpclient.exception.CertServiceApiResponseException;
-import org.onap.aaf.certservice.client.httpclient.exception.HttpClientException;
-import org.onap.aaf.certservice.client.httpclient.model.CertServiceResponse;
+import org.onap.oom.certservice.client.httpclient.exception.CertServiceApiResponseException;
+import org.onap.oom.certservice.client.httpclient.exception.HttpClientException;
+import org.onap.oom.certservice.client.httpclient.model.CertServiceResponse;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import static org.onap.aaf.certservice.client.CerServiceRequestTestData.CA_NAME;
-import static org.onap.aaf.certservice.client.CerServiceRequestTestData.CORRECT_RESPONSE;
-import static org.onap.aaf.certservice.client.CerServiceRequestTestData.CSR;
-import static org.onap.aaf.certservice.client.CerServiceRequestTestData.EXPECTED_FIRST_ELEMENT_OF_CERTIFICATE_CHAIN;
-import static org.onap.aaf.certservice.client.CerServiceRequestTestData.EXPECTED_FIRST_ELEMENT_OF_TRUSTED_CERTIFICATES;
-import static org.onap.aaf.certservice.client.CerServiceRequestTestData.MISSING_PK_RESPONSE;
-import static org.onap.aaf.certservice.client.CerServiceRequestTestData.PK;
+import static org.onap.oom.certservice.client.CerServiceRequestTestData.CA_NAME;
+import static org.onap.oom.certservice.client.CerServiceRequestTestData.CORRECT_RESPONSE;
+import static org.onap.oom.certservice.client.CerServiceRequestTestData.CSR;
+import static org.onap.oom.certservice.client.CerServiceRequestTestData.EXPECTED_FIRST_ELEMENT_OF_CERTIFICATE_CHAIN;
+import static org.onap.oom.certservice.client.CerServiceRequestTestData.EXPECTED_FIRST_ELEMENT_OF_TRUSTED_CERTIFICATES;
+import static org.onap.oom.certservice.client.CerServiceRequestTestData.MISSING_PK_RESPONSE;
+import static org.onap.oom.certservice.client.CerServiceRequestTestData.PK;
class HttpClientTest {
#Generate certService private and public keys
step_9:
@echo "Generate certService private and public keys"
- keytool -genkeypair -v -alias aaf-cert-service -keyalg RSA -keysize 2048 -validity 365 \
+ keytool -genkeypair -v -alias oom-cert-service -keyalg RSA -keysize 2048 -validity 365 \
-keystore certServiceServer-keystore.jks -storetype JKS \
-dname "CN=onap.org,OU=ONAP,O=Linux-Foundation,L=San-Francisco,ST=California,C=US" \
-keypass secret -storepass secret -ext BasicConstraints:critical="ca:false"
#Generate certificate signing request for certService
step_10:
@echo "Generate certificate signing request for certService"
- keytool -certreq -keystore certServiceServer-keystore.jks -alias aaf-cert-service -storepass secret -file certServiceServer.csr
+ keytool -certreq -keystore certServiceServer-keystore.jks -alias oom-cert-service -storepass secret -file certServiceServer.csr
@echo "####done####"
#Sign certService certificate by root CA
@echo "Sign certService certificate by root CA"
keytool -gencert -v -validity 365 -keystore root-keystore.jks -storepass secret -alias root \
-infile certServiceServer.csr -outfile certServiceServerByRoot.crt -rfc -ext bc=0 \
- -ext ExtendedkeyUsage="serverAuth,clientAuth" -ext SubjectAlternativeName:="DNS:aaf-cert-service,DNS:localhost"
+ -ext ExtendedkeyUsage="serverAuth,clientAuth" -ext SubjectAlternativeName:="DNS:oom-cert-service,DNS:localhost"
@echo "####done####"
#Import root certificate into server
#Import signed certificate into certService
step_13:
@echo "Import signed certificate into certService"
- keytool -importcert -file certServiceServerByRoot.crt -destkeystore certServiceServer-keystore.jks -alias aaf-cert-service \
+ keytool -importcert -file certServiceServerByRoot.crt -destkeystore certServiceServer-keystore.jks -alias oom-cert-service \
-storepass secret -noprompt
@echo "####done####"
-----BEGIN CERTIFICATE-----
-MIIFnjCCA4agAwIBAgIEDQtWKTANBgkqhkiG9w0BAQwFADB3MQswCQYDVQQGEwJV\r
+MIIFnjCCA4agAwIBAgIES09RbTANBgkqhkiG9w0BAQwFADB3MQswCQYDVQQGEwJV\r
UzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuLUZyYW5jaXNjbzEZ\r
MBcGA1UEChMQTGludXgtRm91bmRhdGlvbjENMAsGA1UECxMET05BUDERMA8GA1UE\r
-AxMIb25hcC5vcmcwHhcNMjAwNzA5MDgwNDE1WhcNMzAwNzA3MDgwNDE1WjB3MQsw\r
+AxMIb25hcC5vcmcwHhcNMjAwNzI5MTMxMjQwWhcNMzAwNzI3MTMxMjQwWjB3MQsw\r
CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuLUZy\r
YW5jaXNjbzEZMBcGA1UEChMQTGludXgtRm91bmRhdGlvbjENMAsGA1UECxMET05B\r
UDERMA8GA1UEAxMIb25hcC5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK\r
-AoICAQCkxel9G29Hgy9j7cEQ0BGlPrP9s1SF3ADe7f56jTjQd/jFUsN67Da+l9Dt\r
-vy1yUwPnTr3krpXOHwQKplsuBDMoa0ayRhqUpp6fuSuu/zgGJOQIe7NlJh9FbYfq\r
-ax0nHO8qtwd+eTUCqkwVfOFZpDFwR7Ss73Z++14Em8TgFiIsTlBV1sa/xRWLT9JL\r
-Sqnr0tQiUJewO6sCUsis+U7kEf+QCueJAktMxR70rQcAJ2gd/zlnIaoaL4rF+MU8\r
-xlbEfMK/rxC6jeVm3oJu4ihjDKj1V6PDyEtzjsWQFtM+y6wgd98Kxt+0mHW3mZZ0\r
-+Ul0fHSE0fRNp8qEMOUKYFbCffWBrMBZaOaUy6FSnnGi8frv7WqJXNiO2lClhsN1\r
-2yA1HgiorhK9sXjVdwsjTmJhOdvn5sla22+QXrobNflHZHo8JhWHpZ9RbBWAZdaa\r
-FrEizBoDnkpdaNb2PykYjqPo8D1Y/lOSDOg32wOW50F6bZg3yyQzFe0+PsAPK/u+\r
-b8THRJhkbXYvcAoDQv785aXoaa0mVg+yAvz6dorchJkViaOvUlNl+DNNKGJb1hWc\r
-KWLU1SpH7I9QWQYGExFEzsg4Wv2ErGponSoecAm+IM23mn/fhGrwv1r/bl5WR++5\r
-5nUIAbPysz3yQoMllSsBBOpuSsCLo1KQqQeQxnTwFxLS0Ag2SwIDAQABozIwMDAd\r
-BgNVHQ4EFgQUff+Pkp90yZtYsNvFGhq6SBdL+f0wDwYDVR0TAQH/BAUwAwEB/zAN\r
-BgkqhkiG9w0BAQwFAAOCAgEAAWzAQxiJb+3WiXnVC0AeQ2GBnj3JNWI13WE1VJ1a\r
-+hsKAGHk6ACzsGfN0BiGp81Bt/4y+AinWTPI0xnuYqfJHS8/7sEvC7aSzmR0TsuM\r
-u7xOYCiczoEwlM2YoFt1dRWt+ve6EZgTXzBSm75to7F3HS0dZzRaEKxyOA3ONFHT\r
-tGgT+u7851qJQvNVwTOt54C7/PZ9Me5y98sosiGbp0USKroJbiMXHzIligp8s1uT\r
-+Pm581C8YTVHKciR/4fhChu+tx39ZR2p4AoJFjEvgcWqYy+sOyn+Z8sWWLoj3dFk\r
-xjdpSRLPI771ihGdV2JXwgzN1ei8OvUzrW1a1gLZkZ1ZWtK4rwpJteFh4YW/wuDb\r
-dKElfqXJITmOEO+uT4cJ5+hGa3rl6asxbEJ6vhy7SZPOzgM1uAjRT1MpBtG/ZPY5\r
-mOkjzNbjlNsgwJNkuXCi4+3DWNC3QNrIqm825Wdr79TM3kYGfkK/ngargA0z0KYc\r
-7sF6P0tGo6gLACbx+dO9KFpjBIqVaw9AUwb/IOGm1Yv+QutEISqgDQTKzT0iv2Pt\r
-eSkR2IzaEvH0VmBnTHoHQwrV7x10cMxhwoA1mRvdt8L+gKC91CbVirIiRGCrJabO\r
-GiKKZ+pD5kVi9gy7omrjw2kH6Vu4aQGySGBhzpIZ977oO9u+jaTdMHBtladqVvWd\r
-sIM=
+AoICAQCFkduZzAq9OCELD34x94FqVLtEjBqhuoc70vX1Ymcb9D+LFh4F3tZ+FN1S\r
+C38EnXTRrnoNgO+upv56FhqY0rDvDq8ldgNBnJLHQHJn5L5HNEY4QdP934CcZOUA\r
+6DEDu2CNUq3uuxBSezcQsRMtpCMahsDEL5MBo1OZcrez3vccV4/RuFwvjhRY6Gff\r
+TLJTBnkMZtdjKi1XUS1dzO1R+o1xKH0928FZ+poJggU8ClB6K0rl66uL9mWbLRK6\r
+WuRCFPsfQ3IZQHec1GEjgEx3LbW1YVVCrXrseRfQIRRVQNrVDiC63N4fxfTbg6IP\r
+N06UI0uOvETAV6LaFGM7pFy2EhhY0+njCABp8GiOC9Ti56gzT14oUXp1SMbvEfqH\r
+S3YjS77AxPZLH9Nk4PCTGYsChVe4zBXZMryH99YdKVPZKfwOGug8Q3wpqK6GR27Q\r
+2/z1kqajS75A5nQRRS280ocHUjUZei9WDsvoewEbksKazH2z8UDiO7VmihC1z8LZ\r
+2wDGt3NaCcWYiMY2JUE7nMS/N4+S+uVGK3tLUn4VYCuTTBJwR7Fl3pptQUpH4ghJ\r
+faJQ3ZyUkxr+7C1qky3KpWCPIbpwZ0Z+jza44KcwZhtykSiUGNs2ZVAgYdKWKEzN\r
+3IaiRTZ8a26thx3Emc3VW8C1ROKV7Z1xRtMIThHCQCAuCosiqwIDAQABozIwMDAd\r
+BgNVHQ4EFgQUrgR74ialS4IseMsG3HxOI1ZnzlswDwYDVR0TAQH/BAUwAwEB/zAN\r
+BgkqhkiG9w0BAQwFAAOCAgEAgLlAXuD3EQpn5vn2wkUcF0yFLG5UzjaTwHQAAdZU\r
+jtK+9IxcccOwMCaF3S17eqRxiVO6a+fxTsS5yXY8qsvmbJpeDStMUWgPUDVAf1XP\r
+sZ0LI2c/V9R4JKYSUTXkpW1Ljkiu7AqO+VRV43I8//sjDr7gotusdehrLGyFQy9S\r
+aQPmg3fk/zN8solAATD1+FMxoawmoQUAUvKVlGYpVu0JOaZywhF9QI9E1eJziUxO\r
+5B3TcDVlbSxmEVHD1Z/Vc3e50yN+vxN2tQBLkfM9uBDON75TiFXSBd0rUfaOXjb+\r
+Zab5vMF4h4VeUocx+BJtA1SDuEF5JoKY+1QL8ZOIkWtsCaiQQ6psJDLP4GVic6k7\r
+FFh9nL4KFCGVKh7Q7RqUiyUhU69MYFNEHcEpZvBrksInlXwIdDv9v2gVGufjp7+2\r
+2YdOzzOVYP+/kbLbNwYPVEKs2BQK97SNw+0AN0ZM1y2XdXQ14HHh9VxhKPj7FUpV\r
+c7u8CaQMjCotLvKLcCxlVkOBTpPPO75i81Z+j8BMqIdTOp5KptZLvPRavJY31VTs\r
+OPULKA0vjdEmid/syLuta9BSNvyJkhvvJmQ43LCRpteOOQsB6MhHvYZqsubifsJE\r
+SSe1GKF90FIPp6/P2ya5jwVl3KyLmOBMplJIbIekS8EVNvkEGIHhBS2AYr2VDsgK\r
+YhM=
-----END CERTIFICATE-----
#Client envs
-REQUEST_URL=https://aaf-cert-service:8443/v1/certificate/
+REQUEST_URL=https://oom-cert-service:8443/v1/certificate/
REQUEST_TIMEOUT=10000
OUTPUT_PATH=/var/certs
CA_NAME=RA
COUNTRY=US
SANS=example.org
#Tls config envs
-KEYSTORE_PATH=/etc/onap/aaf/certservice/certs/certServiceClient-keystore.jks
+KEYSTORE_PATH=/etc/onap/oom/certservice/certs/certServiceClient-keystore.jks
KEYSTORE_PASSWORD=secret
-TRUSTSTORE_PATH=/etc/onap/aaf/certservice/certs/truststore.jks
+TRUSTSTORE_PATH=/etc/onap/oom/certservice/certs/truststore.jks
TRUSTSTORE_PASSWORD=secret
"cmpv2Servers": [
{
"caName": "Client",
- "url": "http://aafcert-ejbca:8080/ejbca/publicweb/cmp/cmp",
+ "url": "http://oomcert-ejbca:8080/ejbca/publicweb/cmp/cmp",
"issuerDN": "CN=ManagementCA",
"caMode": "CLIENT",
"authentication": {
},
{
"caName": "RA",
- "url": "http://aafcert-ejbca:8080/ejbca/publicweb/cmp/cmpRA",
+ "url": "http://oomcert-ejbca:8080/ejbca/publicweb/cmp/cmpRA",
"issuerDN": "CN=ManagementCA",
"caMode": "RA",
"authentication": {
ejbca:
image: primekey/ejbca-ce:6.15.2.5
hostname: cahostname
- container_name: aafcert-ejbca
+ container_name: oomcert-ejbca
ports:
- "80:8080"
- "443:8443"
networks:
- certservice
- aaf-cert-service:
- image: onap/org.onap.aaf.certservice.aaf-certservice-api:latest
+ oom-cert-service:
+ image: onap/org.onap.oom.certservice.oom-certservice-api:latest
volumes:
- - ./compose-resources/cmpServers.json:/etc/onap/aaf/certservice/cmpServers.json
- - ./certs/truststore.jks:/etc/onap/aaf/certservice/certs/truststore.jks
- - ./certs/root.crt:/etc/onap/aaf/certservice/certs/root.crt
- - ./certs/certServiceServer-keystore.jks:/etc/onap/aaf/certservice/certs/certServiceServer-keystore.jks
- - ./certs/certServiceServer-keystore.p12:/etc/onap/aaf/certservice/certs/certServiceServer-keystore.p12
- container_name: aafcert-service
+ - ./compose-resources/cmpServers.json:/etc/onap/oom/certservice/cmpServers.json
+ - ./certs/truststore.jks:/etc/onap/oom/certservice/certs/truststore.jks
+ - ./certs/root.crt:/etc/onap/oom/certservice/certs/root.crt
+ - ./certs/certServiceServer-keystore.jks:/etc/onap/oom/certservice/certs/certServiceServer-keystore.jks
+ - ./certs/certServiceServer-keystore.p12:/etc/onap/oom/certservice/certs/certServiceServer-keystore.p12
+ container_name: oomcert-service
ports:
- "8443:8443"
depends_on:
ejbca:
condition: service_healthy
healthcheck:
- test: ["CMD-SHELL", "curl https://localhost:8443/actuator/health --cacert /etc/onap/aaf/certservice/certs/root.crt --cert-type p12 --cert /etc/onap/aaf/certservice/certs/certServiceServer-keystore.p12 --pass secret"]
+ test: ["CMD-SHELL", "curl https://localhost:8443/actuator/health --cacert /etc/onap/oom/certservice/certs/root.crt --cert-type p12 --cert /etc/onap/oom/certservice/certs/certServiceServer-keystore.p12 --pass secret"]
interval: 10s
timeout: 3s
retries: 15
-## AAF Certification Service documentation
+## OOM Certification Service documentation
###Requirements
Python 3.x
.. Copyright 2020 NOKIA
.. _master_index:
-AAF Certification Service
+OOM Certification Service
==========================================
.. toctree::
-------
#. JJB Master
- https://jenkins.onap.org/view/aaf/job/aaf-certservice-master-merge-java/
+ https://jenkins.onap.org/view/oom-platform-cert-service/job/oom-platform-cert-service-master-merge-java/
#. JJB Stage
- https://jenkins.onap.org/view/aaf/job/aaf-certservice-maven-docker-stage-master/
+ https://jenkins.onap.org/view/oom-platform-cert-service/job//oom-platform-cert-service-maven-docker-stage-master/
#. JJB Release
- https://jenkins.onap.org/view/aaf/job/aaf-certservice-maven-stage-master/
- https://jenkins.onap.org/view/aaf/job/aaf-certservice-release-merge/
+ https://jenkins.onap.org/view/oom-platform-cert-service/job//oom-platform-cert-service-maven-stage-master/
+ https://jenkins.onap.org/view/oom-platform-cert-service/job//oom-platform-cert-service-release-merge/
#. JJB CSIT
- https://jenkins.onap.org/view/CSIT/job/aaf-master-csit-certservice/
+ https://jenkins.onap.org/view/CSIT/job/oom-platform-cert-service-master-csit-certservice/
Environment
-----------
How to build images?
--------------------
-#. Checkout the project from https://gerrit.onap.org/r/#/admin/projects/aaf/certservice
+#. Checkout the project from https://gerrit.onap.org/r/#/admin/projects/oom/platform/cert-service
#. Read information stored in README.md file
#. Use a Makefile to build images::
"cmpv2Servers": [
{
"caName": "Client",
- "url": "http://aafcert-ejbca:8080/ejbca/publicweb/cmp/cmp",
+ "url": "http://oomcert-ejbca:8080/ejbca/publicweb/cmp/cmp",
"issuerDN": "CN=ManagementCA",
"caMode": "CLIENT",
"authentication": {
},
{
"caName": "RA",
- "url": "http://aafcert-ejbca:8080/ejbca/publicweb/cmp/cmpRA",
+ "url": "http://oomcert-ejbca:8080/ejbca/publicweb/cmp/cmpRA",
"issuerDN": "CN=ManagementCA",
"caMode": "RA",
"authentication": {
docker exec -it <certservice-container-name> bash
e.g.
- docker exec -it aafcert-service bash
+ docker exec -it oomcert-service bash
3. Edit *cmpServers.json* file::
- vim /etc/onap/aaf/certservice/cmpServers.json
+ vim /etc/onap/oom/certservice/cmpServers.json
4. Save the file. Note that this file is mounted as volume, so change will be persistent.
5. Reload configuration::
- curl -I https://localhost:8443/reload --cacert /etc/onap/aaf/certservice/certs/root.crt --cert-type p12 --cert /etc/onap/aaf/certservice/certs/certServiceServer-keystore.p12 --pass $KEYSTORE_PASSWORD
+ curl -I https://localhost:8443/reload --cacert /etc/onap/oom/certservice/certs/root.crt --cert-type p12 --cert /etc/onap/oom/certservice/certs/certServiceServer-keystore.p12 --pass $KEYSTORE_PASSWORD
6. Exit container::
Before OOM installation:
""""""""""""""""""""""""
-Note! This must be executed before calling *make all* (from OOM Installation) or needs remaking AAF charts.
+Note! This must be executed before calling *make all* (from OOM Installation) or needs remaking OOM charts.
1. Edit *cmpServers.json* file. If OOM *global.addTestingComponents* flag is set to:
To instantiate an EJBCA server for testing purposes with an OOM deployment, cmpv2Enabled and cmpv2Testing have to be changed to true in oom/kubernetes/aaf/values.yaml.
-cmpv2Enabled has to be true to enable aaf-cert-service to be instantiated and used with an external Certificate Authority to get certificates for secure communication.
+cmpv2Enabled has to be true to enable oom-cert-service to be instantiated and used with an external Certificate Authority to get certificates for secure communication.
If cmpv2Testing is enabled then an EJBCA test server will be instantiated in the OOM deployment as well, and will come pre-configured with a test CA to request a certificate from.
In Frankfurt release AAF was enhanced by Certificate Management Protocol ver. 2 (CMPv2) support. Such support is handled by new AAF's microservice called CertService. CertService provides certificates signed by external CMPv2 server - further on such certificates are called operators certificates. Operators certificates are meant to secure external ONAP traffic - traffic between network functions (xNFs) and ONAP.
+In Guilin release CertService was moved from AAF repository to OOM repository.
+
Context View
------------
docker logs <cert-service-container-name>
e.g.
- docker logs aafcert-service
+ docker logs oomcert-service
- Kubernetes:
docker exec -it <cert-service-container-name> bash
e.g.
- docker exec -it aafcert-service bash
+ docker exec -it oomcert-service bash
- Kubernetes:
Path to logs:
- /var/log/onap/aaf/certservice
+ /var/log/onap/oom/certservice
Available log files:
docker logs <cert-service-client-container-name>
e.g.
- docker logs aafcert-client
+ docker logs oomcert-client
- Kubernetes:
CertService client is used as init container in other components. In the following example:
Offered APIs
=============
-AAF Cert Service Api
+OOM Cert Service Api
--------------------
.. code-block:: yaml
# ============LICENSE_START=======================================================
-# aaf-certservice
+# oom-certservice
# ================================================================================
# Copyright (C) 2020 Nokia. All rights reserved.
# ================================================================================
1. Parameters for generating certification artifacts and connecting to CertService API to obtain certificate and trust anchors
- - REQUEST_URL *(default: https://aaf-cert-service:8443/v1/certificate/)* - URL to CertService API
+ - REQUEST_URL *(default: https://oom-cert-service:8443/v1/certificate/)* - URL to CertService API
- REQUEST_TIMEOUT *(default: 30000[ms])* - Timeout in milliseconds for REST API calls
- OUTPUT_PATH *(required)* - Path where client will output generated certificate and trust anchor
- CA_NAME *(required)* - Name of CA which will enroll certificate. Must be same as configured on server side. Used in REST API calls
.. code-block:: bash
- nexus3.onap.org:10001/onap/org.onap.aaf.certservice.aaf-certservice-client:$VERSION
+ nexus3.onap.org:10001/onap/org.onap.oom.certservice.oom-certservice-client:$VERSION
As standalone docker container
------------------------------
-You need certificate and trust anchors to connect to CertService API via HTTPS. Information how to generate truststore and keystore files you can find in project repository README `Gerrit GitWeb <https://gerrit.onap.org/r/gitweb?p=aaf%2Fcertservice.git;a=summary>`__
+You need certificate and trust anchors to connect to CertService API via HTTPS. Information how to generate truststore and keystore files you can find in project repository README `Gerrit GitWeb <https://gerrit.onap.org/r/gitweb?p=oom%2Fplatform%2Fcert-service.git;a=summary>`__
To run CertService client as standalone docker container execute following steps:
SANS=test.onap.org:onap.com
#TLS config envs
- KEYSTORE_PATH=/etc/onap/aaf/certservice/certs/certServiceClient-keystore.jks
+ KEYSTORE_PATH=/etc/onap/oom/certservice/certs/certServiceClient-keystore.jks
KEYSTORE_PASSWORD=<password to certServiceClient-keystore.jks>
- TRUSTSTORE_PATH=/etc/onap/aaf/certservice/certs/certServiceClient-truststore.jks
+ TRUSTSTORE_PATH=/etc/onap/oom/certservice/certs/certServiceClient-truststore.jks
TRUSTSTORE_PASSWORD=<password to certServiceClient-truststore.jks>
2. Run docker container as in following example (API and client must be running in same network):
docker run \
--rm \
- --name aafcert-client \
+ --name oomcert-client \
--env-file <$PWD/client.env (same as in step1)> \
--network <docker network of cert service> \
--mount type=bind,src=<path to local host directory where certificate and trust anchor will be created>,dst=<OUTPUT_PATH (same as in step 1)> \
--volume <local path to keystore in JKS format>:<KEYSTORE_PATH> \
--volume <local path to truststore in JKS format>:<TRUSTSTORE_PATH> \
- nexus3.onap.org:10001/onap/org.onap.aaf.certservice.aaf-certservice-client:$VERSION
+ nexus3.onap.org:10001/onap/org.onap.oom.certservice.oom-certservice-client:$VERSION
.. code-block:: bash
- INFO 1 [ main] o.o.a.c.c.c.f.ClientConfigurationFactory : Successful validation of Client configuration. Configuration data: REQUEST_URL: https://aaf-cert-service:8443/v1/certificate/, REQUEST_TIMEOUT: 10000, OUTPUT_PATH: /var/certs, CA_NAME: RA, OUTPUT_TYPE: P12
+ INFO 1 [ main] o.o.a.c.c.c.f.ClientConfigurationFactory : Successful validation of Client configuration. Configuration data: REQUEST_URL: https://oom-cert-service:8443/v1/certificate/, REQUEST_TIMEOUT: 10000, OUTPUT_PATH: /var/certs, CA_NAME: RA, OUTPUT_TYPE: P12
INFO 1 [ main] o.o.a.c.c.c.f.CsrConfigurationFactory : Successful validation of CSR configuration. Configuration data: COMMON_NAME: onap.org, COUNTRY: US, STATE: California, ORGANIZATION: Linux-Foundation, ORGANIZATION_UNIT: ONAP, LOCATION: San-Francisco, SANS: test.onap.org:onap.org
INFO 1 [ main] o.o.a.c.c.c.KeyPairFactory : KeyPair generation started with algorithm: RSA and key size: 2048
INFO 1 [ main] o.o.a.c.c.c.CsrFactory : Creation of CSR has been started with following parameters: COMMON_NAME: onap.org, COUNTRY: US, STATE: California, ORGANIZATION: Linux-Foundation, ORGANIZATION_UNIT: ONAP, LOCATION: San-Francisco, SANS: test.onap.org:onap.org
INFO 1 [ main] o.o.a.c.c.c.CsrFactory : Creation of CSR has been completed successfully
INFO 1 [ main] o.o.a.c.c.c.CsrFactory : Conversion of CSR to PEM has been started
INFO 1 [ main] o.o.a.c.c.c.PrivateKeyToPemEncoder : Attempt to encode private key to PEM
- INFO 1 [ main] o.o.a.c.c.h.HttpClient : Attempt to send request to API, on url: https://aaf-cert-service:8443/v1/certificate/RA
+ INFO 1 [ main] o.o.a.c.c.h.HttpClient : Attempt to send request to API, on url: https://oom-cert-service:8443/v1/certificate/RA
INFO 1 [ main] o.o.a.c.c.h.HttpClient : Received response from API
DEBUG 1 [ main] o.o.a.c.c.c.c.ConvertedArtifactsCreator : Attempt to create keystore files and saving data. File names: keystore.p12, keystore.pass
INFO 1 [ main] o.o.a.c.c.c.c.PemConverter : Conversion of PEM certificates to PKCS12 keystore
...
initContainers:
- name: cert-service-client
- image: nexus3.onap.org:10001/onap/org.onap.aaf.certservice.aaf-certservice-client:latest
+ image: nexus3.onap.org:10001/onap/org.onap.oom.certservice.oom-certservice-client:latest
imagePullPolicy: Always
env:
- name: REQUEST_URL
- value: https://aaf-cert-service:8443/v1/certificate/
+ value: https://oom-cert-service:8443/v1/certificate/
- name: REQUEST_TIMEOUT
value: "1000"
- name: OUTPUT_PATH
- name: SANS
value: test.onap.org:onap.com
- name: KEYSTORE_PATH
- value: /etc/onap/aaf/certservice/certs/certServiceClient-keystore.jks
+ value: /etc/onap/oom/certservice/certs/certServiceClient-keystore.jks
- name: KEYSTORE_PASSWORD
value: secret
- name: TRUSTSTORE_PATH
- value: /etc/onap/aaf/certservice/certs/truststore.jks
+ value: /etc/onap/oom/certservice/certs/truststore.jks
- name: TRUSTSTORE_PASSWORD
value: secret
volumeMounts:
- mountPath: /var/certs
name: certs
- - mountPath: /etc/onap/aaf/certservice/certs/
+ - mountPath: /etc/onap/oom/certservice/certs/
name: tls-volume
...
volumes:
emptyDir: {}
- name tls-volume
secret:
- secretName: aaf-cert-service-client-tls-secret # Value of global.aaf.certService.client.secret.name
+ secretName: oom-cert-service-client-tls-secret # Value of global.oom.certService.client.secret.name
...
<artifactId>oparent</artifactId>
<version>3.0.0</version>
</parent>
- <groupId>org.onap.aaf.certservice</groupId>
- <artifactId>aaf-certservice</artifactId>
+ <groupId>org.onap.oom.platform.cert-service</groupId>
+ <artifactId>oom-certservice</artifactId>
<version>1.2.0-SNAPSHOT</version>
- <name>aaf-certservice</name>
- <description>AAF Certification Service</description>
+ <name>oom-certservice</name>
+ <description>OOM Certification Service</description>
<packaging>pom</packaging>
<properties>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
- <sitePath>/content/sites/site/org/onap/aaf/cert-service/${project.artifactId}/${project.version}</sitePath>
+ <sitePath>/content/sites/site/org/onap/oom/cert-service/${project.artifactId}/${project.version}</sitePath>
<java.version>11</java.version>
<springdoc-openapi-maven-plugin.apiDocsUrl>http://localhost:8080/v3/api-docs.yaml</springdoc-openapi-maven-plugin.apiDocsUrl>
<distributionManagement>
<repository>
<id>ecomp-releases</id>
- <name>AAF Release Repository</name>
+ <name>OOM Release Repository</name>
<url>${nexusproxy}${releaseNexusPath}</url>
</repository>
<snapshotRepository>
<id>ecomp-snapshots</id>
- <name>AAF Snapshot Repository</name>
+ <name>OOM Snapshot Repository</name>
<url>${nexusproxy}${snapshotNexusPath}</url>
</snapshotRepository>
<site>
Code Review / oom / platform / cert-service.git / commitdiff