upd: the world changed to need our test vectors for public suffix list

[gigi.git] / src / org / cacert / gigi / dbObjects / Certificate.java

diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java
index ada9ca90f2f589e6e075423c9e2e606a398aa6af..85ba0346e82e5b3494308b5fdd9f51ff0d4bc14d 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/Certificate.java
+++ b/src/org/cacert/gigi/dbObjects/Certificate.java
@@ -151,23 +151,19 @@ public class Certificate {
         this.sans = Arrays.asList(sans);
     }
 
-    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;
+        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);
@@ -363,7 +359,27 @@ public class Certificate {
         }
         // TODO caching?
         try {
-            return new Certificate(serial);
+            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, 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();
+            return new Certificate(rs);
+        } catch (IllegalArgumentException e) {
+
+        }
+        return null;
+    }
+
+    public static Certificate getById(int id) {
+
+        // TODO caching?
+        try {
+            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, 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();
+
+            return new Certificate(rs);
         } catch (IllegalArgumentException e) {
 
         }
@@ -391,4 +407,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;
+    }
 }