Implement store and load (with testcase)

diff --git a/src/org/cacert/gigi/Certificate.java b/src/org/cacert/gigi/Certificate.java
index fca5c5a835e993a7cd68a1543d54e18f6423afec..32ada17f59465b0c001fd5081d83886c0198a5b4 100644 (file)
--- a/src/org/cacert/gigi/Certificate.java
+++ b/src/org/cacert/gigi/Certificate.java
@@ -11,6 +11,10 @@ import java.security.cert.X509Certificate;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
 
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.util.Job;
@@ -20,6 +24,41 @@ import org.cacert.gigi.util.Notary;
 
 public class Certificate {
 
+    public enum SANType {
+        EMAIL("email"), DNS("DNS");
+
+        private final String opensslName;
+
+        private SANType(String opensslName) {
+            this.opensslName = opensslName;
+        }
+
+        public String getOpensslName() {
+            return opensslName;
+        }
+    }
+
+    public static class SubjectAlternateName {
+
+        private SANType type;
+
+        private String name;
+
+        public SubjectAlternateName(SANType type, String name) {
+            this.type = type;
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public SANType getType() {
+            return type;
+        }
+
+    }
+
     public enum CSRType {
         CSR, SPKAC;
     }
@@ -42,12 +81,15 @@ public class Certificate {
 
     private CSRType csrType;
 
-    public Certificate(int ownerId, String dn, String md, String csr, CSRType csrType) {
+    private List<SubjectAlternateName> sans;
+
+    public Certificate(int ownerId, String dn, String md, String csr, CSRType csrType, SubjectAlternateName... sans) {
         this.ownerId = ownerId;
         this.dn = dn;
         this.md = md;
         this.csr = csr;
         this.csrType = csrType;
+        this.sans = Arrays.asList(sans);
     }
 
     private Certificate(String serial) {
@@ -65,6 +107,16 @@ public class Certificate {
             crtName = rs.getString(5);
             ownerId = rs.getInt(6);
             this.serial = serial;
+
+            PreparedStatement ps2 = DatabaseConnection.getInstance().prepare("SELECT contents, type FROM `subjectAlternativeNames` WHERE certId=?");
+            ps2.setInt(1, id);
+            ResultSet rs2 = ps2.executeQuery();
+            sans = new LinkedList<>();
+            while (rs2.next()) {
+                sans.add(new SubjectAlternateName(SANType.valueOf(rs2.getString("type").toUpperCase()), rs2.getString("contents")));
+            }
+            rs2.close();
+
             rs.close();
         } catch (SQLException e) {
             e.printStackTrace();
@@ -141,10 +193,12 @@ public class Certificate {
 
         // TODO draft to insert SANs
         PreparedStatement san = DatabaseConnection.getInstance().prepare("INSERT INTO subjectAlternativeNames SET certId=?, contents=?, type=?");
-        san.setInt(1, id);
-        san.setString(2, "<address>");
-        san.setString(3, "email");
-        // san.execute();
+        for (SubjectAlternateName subjectAlternateName : sans) {
+            san.setInt(1, id);
+            san.setString(2, subjectAlternateName.getName());
+            san.setString(3, subjectAlternateName.getType().getOpensslName());
+            san.execute();
+        }
 
         PreparedStatement updater = DatabaseConnection.getInstance().prepare("UPDATE emailcerts SET csr_name=? WHERE id=?");
         updater.setString(1, csrName);
@@ -210,6 +264,10 @@ public class Certificate {
         return ownerId;
     }
 
+    public List<SubjectAlternateName> getSans() {
+        return Collections.unmodifiableList(sans);
+    }
+
     public static Certificate getBySerial(String serial) {
         // TODO caching?
         try {

diff --git a/tests/org/cacert/gigi/TestCertificate.java b/tests/org/cacert/gigi/TestCertificate.java
index 99dd03e8127f60d8f28891dcba84b8ba55a2cd6c..c2f474730ccd4b2015f25df84a1bb17a1e6e7b22 100644 (file)
--- a/tests/org/cacert/gigi/TestCertificate.java
+++ b/tests/org/cacert/gigi/TestCertificate.java
@@ -6,9 +6,13 @@ import java.security.KeyPair;
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
 import java.sql.SQLException;
+import java.util.Collection;
+import java.util.List;
 
 import org.cacert.gigi.Certificate.CSRType;
 import org.cacert.gigi.Certificate.CertificateStatus;
+import org.cacert.gigi.Certificate.SANType;
+import org.cacert.gigi.Certificate.SubjectAlternateName;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;
 
@@ -27,6 +31,53 @@ public class TestCertificate extends ManagedTest {
         assertNotNull(login(pk, ce));
     }
 
+    @Test
+    public void testSans() throws IOException, GeneralSecurityException, SQLException, InterruptedException {
+        KeyPair kp = generateKeypair();
+        String key = generatePEMCSR(kp, "CN=testmail@example.com");
+        Certificate c = new Certificate(1, "/CN=testmail@example.com", "sha256", key, CSRType.CSR, //
+                new SubjectAlternateName(SANType.EMAIL, "testmail@example.com"), new SubjectAlternateName(SANType.DNS, "testmail.example.com"));
+
+        testFails(CertificateStatus.DRAFT, c);
+        c.issue().waitFor(60000);
+        X509Certificate cert = c.cert();
+        Collection<List<?>> sans = cert.getSubjectAlternativeNames();
+        assertEquals(2, sans.size());
+        boolean hadDNS = false;
+        boolean hadEmail = false;
+        for (List<?> list : sans) {
+            assertEquals(2, list.size());
+            Integer type = (Integer) list.get(0);
+            if (type == 1) {
+                hadEmail = true;
+                assertEquals("testmail@example.com", list.get(1));
+            } else if (type == 2) {
+                hadDNS = true;
+                assertEquals("testmail.example.com", list.get(1));
+            } else {
+                fail("Unknown type");
+            }
+        }
+        assertTrue(hadDNS);
+        assertTrue(hadEmail);
+
+        testFails(CertificateStatus.ISSUED, c);
+
+        Certificate c2 = Certificate.getBySerial(c.getSerial());
+        assertEquals(2, c2.getSans().size());
+        assertEquals(c.getSans().get(0).getName(), c2.getSans().get(0).getName());
+        assertEquals(c.getSans().get(0).getType(), c2.getSans().get(0).getType());
+        assertEquals(c.getSans().get(1).getName(), c2.getSans().get(1).getName());
+        assertEquals(c.getSans().get(1).getType(), c2.getSans().get(1).getType());
+
+        try {
+            c2.getSans().remove(0);
+            fail("the list should no be modifiable");
+        } catch (UnsupportedOperationException e) {
+            // expected
+        }
+    }
+
     @Test
     public void testCertLifeCycle() throws IOException, GeneralSecurityException, SQLException, InterruptedException {
         KeyPair kp = generateKeypair();