<parent>
<groupId>org.onap.oom.platform.cert-service</groupId>
<artifactId>oom-certservice</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</parent>
<artifactId>oom-certservice-api</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<name>oom-certservice-api</name>
<description>OOM Certification Service Api</description>
<packaging>jar</packaging>
major=2
minor=3
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT
<parent>
<artifactId>oom-certservice</artifactId>
<groupId>org.onap.oom.platform.cert-service</groupId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>oom-certservice-client</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<name>oom-certservice-client</name>
<description>OOM Certification Service Api Client</description>
<packaging>jar</packaging>
import java.util.Optional;
import java.util.stream.Collectors;
import javax.security.auth.x500.X500Principal;
+import org.apache.commons.collections.CollectionUtils;
import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
import org.bouncycastle.asn1.x509.Extension;
import org.bouncycastle.asn1.x509.Extensions;
JcaPKCS10CertificationRequestBuilder builder = new JcaPKCS10CertificationRequestBuilder(subject,
keyPair.getPublic());
- if (!configuration.getSans().isEmpty()) {
+ if (!CollectionUtils.isEmpty(configuration.getSans())) {
builder.addAttribute(PKCSObjectIdentifiers.pkcs_9_at_extensionRequest, generateSansExtension());
}
class CsrFactoryTest {
- CsrConfiguration config = mock(CsrConfiguration.class);
+ private CsrConfiguration config = mock(CsrConfiguration.class);
@Test
void createEncodedCsr_shouldSucceedWhenAllFieldsAreSetCorrectly()
throws KeyPairGenerationException, CsrGenerationException {
- KeyPair keyPair =
- new KeyPairFactory(EncryptionAlgorithmConstants.RSA_ENCRYPTION_ALGORITHM,
- EncryptionAlgorithmConstants.KEY_SIZE).create();
- San san1 = new San("onapexample.com", GeneralName.dNSName);
- San san2 = new San("onapexample.com.pl", GeneralName.dNSName);
+ KeyPair keyPair = createKeyPair();
+
+ mockRequiredConfigFields();
+ mockOptionalConfigFields();
+
+ assertThat(new CsrFactory(config).createCsrInPem(keyPair)).isNotEmpty();
+ }
+ @Test
+ void createEncodedCsr_shouldSucceedWhenRequiredFieldsAreSetCorrectly()
+ throws KeyPairGenerationException, CsrGenerationException {
+
+ KeyPair keyPair = createKeyPair();
+
+ mockRequiredConfigFields();
+ mockOptionalConfigFieldsEmpty();
+
+ assertThat(new CsrFactory(config).createCsrInPem(keyPair)).isNotEmpty();
+ }
+
+ private KeyPair createKeyPair() {
+ return new KeyPairFactory(EncryptionAlgorithmConstants.RSA_ENCRYPTION_ALGORITHM,
+ EncryptionAlgorithmConstants.KEY_SIZE).create();
+ }
+
+ private void mockRequiredConfigFields() {
when(config.getCommonName()).thenReturn("onap.org");
- when(config.getSans()).thenReturn(List.of(san1, san2));
+ when(config.getOrganization()).thenReturn("Linux-Foundation");
when(config.getCountry()).thenReturn("US");
+ when(config.getState()).thenReturn("California");
+ }
+
+ private void mockOptionalConfigFields() {
+ San san1 = new San("onapexample.com", GeneralName.dNSName);
+ San san2 = new San("onapexample.com.pl", GeneralName.dNSName);
+
when(config.getLocation()).thenReturn("San-Francisco");
- when(config.getOrganization()).thenReturn("Linux-Foundation");
+ when(config.getSans()).thenReturn(List.of(san1, san2));
when(config.getOrganizationUnit()).thenReturn("ONAP");
- when(config.getState()).thenReturn("California");
+ }
- assertThat(new CsrFactory(config).createCsrInPem(keyPair)).isNotEmpty();
+ private void mockOptionalConfigFieldsEmpty() {
+ when(config.getLocation()).thenReturn(null);
+ when(config.getSans()).thenReturn(null);
+ when(config.getOrganizationUnit()).thenReturn(null);
}
}
major=2
minor=3
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT
<parent>
<artifactId>oom-certservice</artifactId>
<groupId>org.onap.oom.platform.cert-service</groupId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>oom-certservice</artifactId>
<groupId>org.onap.oom.platform.cert-service</groupId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>oom-certservice-post-processor</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<name>oom-certservice-post-processor</name>
<description>An application which conducts certificate post-processing like: merging truststores, copying keystores.</description>
<packaging>jar</packaging>
</parent>
<groupId>org.onap.oom.platform.cert-service</groupId>
<artifactId>oom-certservice</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.3.1-SNAPSHOT</version>
<name>oom-certservice</name>
<description>OOM Certification Service</description>
<packaging>pom</packaging>
major=2
minor=3
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT