X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FCertificate.java;h=4300ac9abaa19fcb88b9120f92c6faed59ca00ac;hp=9a857fe4e75d9b2640615172ee197e6937479017;hb=b47144d6f3bf6b6eb1ec477de9d2af38256f074f;hpb=0396bd9a17ee73f8dc3c0f8a4424424f3ce16ead

diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java
index 9a857fe4..4300ac9a 100644
--- a/src/org/cacert/gigi/dbObjects/Certificate.java
+++ b/src/org/cacert/gigi/dbObjects/Certificate.java
@@ -20,11 +20,10 @@ import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
-import org.cacert.gigi.util.Job;
 import org.cacert.gigi.util.KeyStorage;
 import org.cacert.gigi.util.Notary;
 
-public class Certificate {
+public class Certificate implements IdCachable {
 
     public enum SANType {
         EMAIL("email"), DNS("DNS");
@@ -132,8 +131,10 @@ public class Certificate {
 
     private String dnString;
 
-    public Certificate(User owner, HashMap<String, String> dn, String md, String csr, CSRType csrType, CertificateProfile profile, SubjectAlternateName... sans) throws GigiApiException {
-        if ( !owner.canIssue(profile)) {
+    private CACertificate ca;
+
+    public Certificate(User owner, HashMap<String, String> dn, String md, String csr, CSRType csrType, CertificateProfile profile, SubjectAlternateName... sans) throws GigiApiException, IOException {
+        if ( !profile.canBeIssuedBy(owner)) {
             throw new GigiApiException("You are not allowed to issue these certificates.");
         }
         this.owner = owner;
@@ -147,27 +148,61 @@ public class Certificate {
         this.csrType = csrType;
         this.profile = profile;
         this.sans = Arrays.asList(sans);
+        synchronized (Certificate.class) {
+
+            GigiPreparedStatement inserter = DatabaseConnection.getInstance().prepare("INSERT INTO certs SET md=?::`mdType`, csr_type=?::`csrType`, crt_name='', memid=?, profile=?");
+            inserter.setString(1, md.toLowerCase());
+            inserter.setString(2, csrType.toString());
+            inserter.setInt(3, owner.getId());
+            inserter.setInt(4, profile.getId());
+            inserter.execute();
+            id = inserter.lastInsertId();
+
+            GigiPreparedStatement san = DatabaseConnection.getInstance().prepare("INSERT INTO `subjectAlternativeNames` SET `certId`=?, contents=?, type=?::`SANType`");
+            for (SubjectAlternateName subjectAlternateName : sans) {
+                san.setInt(1, id);
+                san.setString(2, subjectAlternateName.getName());
+                san.setString(3, subjectAlternateName.getType().getOpensslName());
+                san.execute();
+            }
+
+            GigiPreparedStatement insertAVA = DatabaseConnection.getInstance().prepare("INSERT INTO `certAvas` SET `certId`=?, name=?, value=?");
+            insertAVA.setInt(1, id);
+            for (Entry<String, String> e : dn.entrySet()) {
+                insertAVA.setString(2, e.getKey());
+                insertAVA.setString(3, e.getValue());
+                insertAVA.execute();
+            }
+            File csrFile = KeyStorage.locateCsr(id);
+            csrName = csrFile.getPath();
+            try (FileOutputStream fos = new FileOutputStream(csrFile)) {
+                fos.write(csr.getBytes("UTF-8"));
+            }
+
+            GigiPreparedStatement updater = DatabaseConnection.getInstance().prepare("UPDATE `certs` SET `csr_name`=? WHERE id=?");
+            updater.setString(1, csrName);
+            updater.setInt(2, id);
+            updater.execute();
+
+            cache.put(this);
+        }
     }
 
-    private Certificate(String serial) {
+    private Certificate(GigiResultSet rs) {
         //
-        String concat = "group_concat(concat('/', `name`, '=', REPLACE(REPLACE(value, '\\\\', '\\\\\\\\'), '/', '\\\\/')))";
-        GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT certs.id, " + concat + " as subject, md, csr_name, crt_name,memid, profile FROM `certs` LEFT JOIN certAvas ON certAvas.certid=certs.id WHERE serial=? GROUP BY certs.id");
-        ps.setString(1, serial);
-        GigiResultSet rs = ps.executeQuery();
         if ( !rs.next()) {
             throw new IllegalArgumentException("Invalid mid " + serial);
         }
-        this.id = rs.getInt(1);
-        dnString = rs.getString(2);
-        md = rs.getString(3);
-        csrName = rs.getString(4);
-        crtName = rs.getString(5);
-        owner = User.getById(rs.getInt(6));
-        profile = CertificateProfile.getById(rs.getInt(7));
-        this.serial = serial;
-
-        GigiPreparedStatement ps2 = DatabaseConnection.getInstance().prepare("SELECT contents, type FROM `subjectAlternativeNames` WHERE certId=?");
+        this.id = rs.getInt("id");
+        dnString = rs.getString("subject");
+        md = rs.getString("md");
+        csrName = rs.getString("csr_name");
+        crtName = rs.getString("crt_name");
+        owner = User.getById(rs.getInt("memid"));
+        profile = CertificateProfile.getById(rs.getInt("profile"));
+        this.serial = rs.getString("serial");
+
+        GigiPreparedStatement ps2 = DatabaseConnection.getInstance().prepare("SELECT `contents`, `type` FROM `subjectAlternativeNames` WHERE `certId`=?");
         ps2.setInt(1, id);
         GigiResultSet rs2 = ps2.executeQuery();
         sans = new LinkedList<>();
@@ -210,7 +245,7 @@ public class Certificate {
         if (id == 0) {
             return CertificateStatus.DRAFT;
         }
-        GigiPreparedStatement searcher = DatabaseConnection.getInstance().prepare("SELECT crt_name, created, revoked, serial FROM certs WHERE id=?");
+        GigiPreparedStatement searcher = DatabaseConnection.getInstance().prepare("SELECT crt_name, created, revoked, serial, caid FROM certs WHERE id=?");
         searcher.setInt(1, id);
         GigiResultSet rs = searcher.executeQuery();
         if ( !rs.next()) {
@@ -222,6 +257,7 @@ public class Certificate {
         if (rs.getTimestamp(2) == null) {
             return CertificateStatus.DRAFT;
         }
+        ca = CACertificate.getById(rs.getInt("caid"));
         if (rs.getTimestamp(2) != null && rs.getTimestamp(3) == null) {
             return CertificateStatus.ISSUED;
         }
@@ -248,39 +284,6 @@ public class Certificate {
         }
         Notary.writeUserAgreement(owner, "CCA", "issue certificate", "", true, 0);
 
-        GigiPreparedStatement inserter = DatabaseConnection.getInstance().prepare("INSERT INTO certs SET md=?, csr_type=?, crt_name='', memid=?, profile=?");
-        inserter.setString(1, md);
-        inserter.setString(2, csrType.toString());
-        inserter.setInt(3, owner.getId());
-        inserter.setInt(4, profile.getId());
-        inserter.execute();
-        id = inserter.lastInsertId();
-
-        GigiPreparedStatement san = DatabaseConnection.getInstance().prepare("INSERT INTO subjectAlternativeNames SET certId=?, contents=?, type=?");
-        for (SubjectAlternateName subjectAlternateName : sans) {
-            san.setInt(1, id);
-            san.setString(2, subjectAlternateName.getName());
-            san.setString(3, subjectAlternateName.getType().getOpensslName());
-            san.execute();
-        }
-
-        GigiPreparedStatement insertAVA = DatabaseConnection.getInstance().prepare("INSERT certAvas SET certid=?, name=?, value=?");
-        insertAVA.setInt(1, id);
-        for (Entry<String, String> e : dn.entrySet()) {
-            insertAVA.setString(2, e.getKey());
-            insertAVA.setString(3, e.getValue());
-            insertAVA.execute();
-        }
-        File csrFile = KeyStorage.locateCsr(id);
-        csrName = csrFile.getPath();
-        FileOutputStream fos = new FileOutputStream(csrFile);
-        fos.write(csr.getBytes());
-        fos.close();
-
-        GigiPreparedStatement updater = DatabaseConnection.getInstance().prepare("UPDATE certs SET csr_name=? WHERE id=?");
-        updater.setString(1, csrName);
-        updater.setInt(2, id);
-        updater.execute();
         return Job.sign(this, start, period);
 
     }
@@ -293,6 +296,14 @@ public class Certificate {
 
     }
 
+    public CACertificate getParent() {
+        CertificateStatus status = getStatus();
+        if (status != CertificateStatus.REVOKED && status != CertificateStatus.ISSUED) {
+            throw new IllegalStateException(status + " is not wanted here.");
+        }
+        return ca;
+    }
+
     public X509Certificate cert() throws IOException, GeneralSecurityException {
         CertificateStatus status = getStatus();
         if (status != CertificateStatus.REVOKED && status != CertificateStatus.ISSUED) {
@@ -346,10 +357,46 @@ public class Certificate {
         return profile;
     }
 
-    public static Certificate getBySerial(String serial) {
-        // TODO caching?
+    public synchronized static Certificate getBySerial(String serial) {
+        if (serial == null || "".equals(serial)) {
+            return null;
+        }
         try {
-            return new Certificate(serial);
+            String concat = "string_agg(concat('/', `name`, '=', REPLACE(REPLACE(value, '\\\\', '\\\\\\\\'), '/', '\\\\/')), '')";
+            GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT certs.id, " + concat + " as `subject`, `md`, `csr_name`, `crt_name`,`memid`, `profile`, `certs`.`serial` FROM `certs` LEFT JOIN `certAvas` ON `certAvas`.`certId`=`certs`.`id` WHERE `serial`=? GROUP BY `certs`.`id`");
+            ps.setString(1, serial);
+            GigiResultSet rs = ps.executeQuery();
+            int id = rs.getInt(1);
+            Certificate c1 = cache.get(id);
+            if (c1 != null) {
+                return c1;
+            }
+            Certificate certificate = new Certificate(rs);
+            cache.put(certificate);
+            return certificate;
+        } catch (IllegalArgumentException e) {
+
+        }
+        return null;
+    }
+
+    private static ObjectCache<Certificate> cache = new ObjectCache<>();
+
+    public synchronized static Certificate getById(int id) {
+        Certificate cacheRes = cache.get(id);
+        if (cacheRes != null) {
+            return cacheRes;
+        }
+
+        try {
+            String concat = "string_agg(concat('/', `name`, '=', REPLACE(REPLACE(value, '\\\\', '\\\\\\\\'), '/', '\\\\/')), '')";
+            GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT certs.id, " + concat + " as subject, md, csr_name, crt_name,memid, profile, certs.serial FROM `certs` LEFT JOIN `certAvas` ON `certAvas`.`certId`=certs.id WHERE certs.id=? GROUP BY certs.id");
+            ps.setInt(1, id);
+            GigiResultSet rs = ps.executeQuery();
+
+            Certificate c = new Certificate(rs);
+            cache.put(c);
+            return c;
         } catch (IllegalArgumentException e) {
 
         }
@@ -377,4 +424,17 @@ public class Certificate {
         }
         return res;
     }
+
+    public java.util.Date getRevocationDate() {
+        if (getStatus() == CertificateStatus.REVOKED) {
+            GigiPreparedStatement prep = DatabaseConnection.getInstance().prepare("SELECT revoked FROM certs WHERE id=?");
+            prep.setInt(1, getId());
+            GigiResultSet res = prep.executeQuery();
+            res.beforeFirst();
+            if (res.next()) {
+                return new java.util.Date(res.getDate("revoked").getTime());
+            }
+        }
+        return null;
+    }
 }