fix: Use correct type in dbObjects.Certificate

[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 4300ac9abaa19fcb88b9120f92c6faed59ca00ac..7512712da7a43dbb504417f25522595ba071be1c 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/Certificate.java
+++ b/src/org/cacert/gigi/dbObjects/Certificate.java
@@ -109,11 +109,11 @@ public class Certificate implements IdCachable {
 
     private int id;
 
-    private User owner;
+    private CertificateOwner owner;
 
     private String serial;
 
-    private String md;
+    private Digest md;
 
     private String csrName;
 
@@ -133,8 +133,8 @@ public class Certificate implements IdCachable {
 
     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)) {
+    public Certificate(CertificateOwner owner, User actor, HashMap<String, String> dn, Digest md, String csr, CSRType csrType, CertificateProfile profile, SubjectAlternateName... sans) throws GigiApiException, IOException {
+        if ( !profile.canBeIssuedBy(owner, actor)) {
             throw new GigiApiException("You are not allowed to issue these certificates.");
         }
         this.owner = owner;
@@ -151,7 +151,7 @@ public class Certificate implements IdCachable {
         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(1, md.toString().toLowerCase());
             inserter.setString(2, csrType.toString());
             inserter.setInt(3, owner.getId());
             inserter.setInt(4, profile.getId());
@@ -189,16 +189,12 @@ public class Certificate implements IdCachable {
     }
 
     private Certificate(GigiResultSet rs) {
-        //
-        if ( !rs.next()) {
-            throw new IllegalArgumentException("Invalid mid " + serial);
-        }
         this.id = rs.getInt("id");
         dnString = rs.getString("subject");
-        md = rs.getString("md");
+        md = Digest.valueOf(rs.getString("md").toUpperCase());
         csrName = rs.getString("csr_name");
         crtName = rs.getString("crt_name");
-        owner = User.getById(rs.getInt("memid"));
+        owner = CertificateOwner.getById(rs.getInt("memid"));
         profile = CertificateProfile.getById(rs.getInt("profile"));
         this.serial = rs.getString("serial");
 
@@ -242,9 +238,6 @@ public class Certificate implements IdCachable {
     }
 
     public synchronized CertificateStatus getStatus() {
-        if (id == 0) {
-            return CertificateStatus.DRAFT;
-        }
         GigiPreparedStatement searcher = DatabaseConnection.getInstance().prepare("SELECT crt_name, created, revoked, serial, caid FROM certs WHERE id=?");
         searcher.setInt(1, id);
         GigiResultSet rs = searcher.executeQuery();
@@ -278,11 +271,11 @@ public class Certificate implements IdCachable {
      * @throws GigiApiException
      *             if the period is bogus
      */
-    public Job issue(Date start, String period) throws IOException, GigiApiException {
+    public Job issue(Date start, String period, User actor) throws IOException, GigiApiException {
         if (getStatus() != CertificateStatus.DRAFT) {
             throw new IllegalStateException();
         }
-        Notary.writeUserAgreement(owner, "CCA", "issue certificate", "", true, 0);
+        Notary.writeUserAgreement(actor, "CCA", "issue certificate", "", true, 0);
 
         return Job.sign(this, start, period);
 
@@ -341,11 +334,11 @@ public class Certificate implements IdCachable {
         return dnString;
     }
 
-    public String getMessageDigest() {
+    public Digest getMessageDigest() {
         return md;
     }
 
-    public User getOwner() {
+    public CertificateOwner getOwner() {
         return owner;
     }
 
@@ -366,6 +359,9 @@ public class Certificate implements IdCachable {
             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();
+            if ( !rs.next()) {
+                return null;
+            }
             int id = rs.getInt(1);
             Certificate c1 = cache.get(id);
             if (c1 != null) {
@@ -393,6 +389,9 @@ public class Certificate implements IdCachable {
             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();
+            if ( !rs.next()) {
+                return null;
+            }
 
             Certificate c = new Certificate(rs);
             cache.put(c);