Merge pull request #10 from cescoffier/alias-password-tests

Test for alias passwords
cescoffier · Apr 7, 2024 · bd6deab · bd6deab
2 parents 9479c1e + a0e4809
commit bd6deab
Show file tree

Hide file tree

Showing 2 changed files with 90 additions and 1 deletion.
diff --git a/certificate-generator/src/main/java/me/escoffier/certs/CertificateRequestManager.java b/certificate-generator/src/main/java/me/escoffier/certs/CertificateRequestManager.java
@@ -34,7 +34,11 @@ public CertificateRequestManager(CertificateRequest request) throws Exception {
         for (String alias : request.aliases().keySet()) {
             AliasRequest nested = request.aliases().get(alias);
             // We use the duration of the main certificate.
-            holders.put(alias, new CertificateHolder(nested.getCN(), nested.getSubjectAlternativeNames(), request.getDuration(), nested.hasClient(), nested.getPassword()));
+            String cn = nested.getCN();
+            if (cn == null) {
+                cn = request.getCN();
+            }
+            holders.put(alias, new CertificateHolder(cn, nested.getSubjectAlternativeNames(), request.getDuration(), nested.hasClient(), nested.getPassword()));
         }
     }
 

diff --git a/certificate-generator/src/test/java/me/escoffier/certs/GeneratedKeyStoreTest.java b/certificate-generator/src/test/java/me/escoffier/certs/GeneratedKeyStoreTest.java
@@ -0,0 +1,85 @@
+package me.escoffier.certs;
+
+import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.resource.Dir;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.security.KeyStore;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class GeneratedKeyStoreTest {
+
+
+    @Test
+    void verifyIfJKSKeyStoreSupportAliasPassword(@Dir Path dir) throws Exception {
+        CertificateRequest request = new CertificateRequest()
+                .withFormat(Format.JKS)
+                .withPassword("secret")
+                .withName("jks-alias-verif")
+                .withAlias("alias1", new AliasRequest().withPassword("password-alias1"))
+                .withAlias("alias2", new AliasRequest().withPassword("password-alias2"));
+
+        CertificateGenerator generator = new CertificateGenerator(dir, true);
+        generator.generate(request);
+
+
+        KeyStore ks = KeyStore.getInstance("JKS");
+        File jks = new File(dir.toFile(), "jks-alias-verif-keystore.jks");
+        try (var fis = new java.io.FileInputStream(jks)) {
+            ks.load(fis, "secret".toCharArray());
+        }
+
+        assertThat(ks.containsAlias("jks-alias-verif")).isTrue();
+        assertThat(ks.containsAlias("alias1")).isTrue();
+        assertThat(ks.containsAlias("alias2")).isTrue();
+
+        // Verify the certs
+        assertThat(ks.getCertificate("jks-alias-verif")).isNotNull();
+        assertThat(ks.getCertificate("alias1")).isNotNull();
+        assertThat(ks.getCertificate("alias2")).isNotNull();
+
+        // Verify the keys
+        assertThat(ks.getKey("jks-alias-verif", "secret".toCharArray())).isNotNull();
+        assertThat(ks.getKey("alias1", "password-alias1".toCharArray())).isNotNull();
+        assertThat(ks.getKey("alias2", "password-alias2".toCharArray())).isNotNull();
+    }
+
+    @Test
+    void verifyIfP12SKeyStoreSupportAliasPassword(@Dir Path dir) throws Exception {
+        CertificateRequest request = new CertificateRequest()
+                .withFormat(Format.PKCS12)
+                .withPassword("secret")
+                .withName("p12-alias-verif")
+                .withAlias("alias1", new AliasRequest().withPassword("password-alias1"))
+                .withAlias("alias2", new AliasRequest());
+
+        CertificateGenerator generator = new CertificateGenerator(dir, true);
+        generator.generate(request);
+
+
+        KeyStore ks = KeyStore.getInstance("PKCS12");
+        File jks = new File(dir.toFile(), "p12-alias-verif-keystore.p12");
+        try (var fis = new java.io.FileInputStream(jks)) {
+            ks.load(fis, "secret".toCharArray());
+        }
+
+        assertThat(ks.containsAlias("p12-alias-verif")).isTrue();
+        assertThat(ks.containsAlias("alias1")).isTrue();
+        assertThat(ks.containsAlias("alias2")).isTrue();
+
+        // Verify the certs
+        assertThat(ks.getCertificate("p12-alias-verif")).isNotNull();
+        assertThat(ks.getCertificate("alias1")).isNotNull();
+        assertThat(ks.getCertificate("alias2")).isNotNull();
+
+        // Verify the keys
+        assertThat(ks.getKey("p12-alias-verif", "secret".toCharArray())).isNotNull();
+        assertThat(ks.getKey("alias1", "password-alias1".toCharArray())).isNotNull();
+        assertThat(ks.getKey("alias2", null)).isNotNull();
+
+
+    }
+
+}