X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FCertificate.java;h=f7bc548fb2e2591f38caf3703893edf469ad4653;hb=e2c34865845ec00d4a1e4ba288517060f675609f;hp=479a183ae82a5c59d80c9ca4ae1649627572ed82;hpb=3256b7b19512a2e161e4ae3a8db706d671dc066f;p=gigi.git

diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java
index 479a183a..f7bc548f 100644
--- a/src/org/cacert/gigi/dbObjects/Certificate.java
+++ b/src/org/cacert/gigi/dbObjects/Certificate.java
@@ -135,7 +135,7 @@ public class Certificate {
     private CACertificate ca;
 
     public Certificate(User owner, HashMap<String, String> dn, String md, String csr, CSRType csrType, CertificateProfile profile, SubjectAlternateName... sans) throws GigiApiException {
-        if ( !owner.canIssue(profile)) {
+        if ( !profile.canBeIssuedBy(owner)) {
             throw new GigiApiException("You are not allowed to issue these certificates.");
         }
         this.owner = owner;
@@ -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);
@@ -221,10 +217,10 @@ public class Certificate {
 
         crtName = rs.getString(1);
         serial = rs.getString(4);
-        ca = CACertificate.getById(rs.getInt("caid"));
         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;
         }
@@ -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) {
 
         }