X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FCertificate.java;h=7318ad802ece837cae337919fc638d360fd9bbdc;hp=c0fb6285f57b3ac422db274743106916ca4c2baf;hb=dc10b875c132eb7840a6b9827ec93916076d34f7;hpb=ec24cf6925bb3729a644580ad4a9375d05883c62 diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java index c0fb6285..7318ad80 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"); @@ -110,7 +109,7 @@ public class Certificate { private int id; - private User owner; + private CertificateOwner owner; private String serial; @@ -132,8 +131,10 @@ public class Certificate { private String dnString; - public Certificate(User owner, HashMap dn, String md, String csr, CSRType csrType, CertificateProfile profile, SubjectAlternateName... sans) throws GigiApiException { - if ( !owner.canIssue(profile)) { + private CACertificate ca; + + public Certificate(CertificateOwner owner, User actor, HashMap dn, String 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; @@ -147,27 +148,57 @@ 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(); + } - private Certificate(String 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 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); + GigiPreparedStatement insertAVA = DatabaseConnection.getInstance().prepare("INSERT INTO `certAvas` SET `certId`=?, name=?, value=?"); + insertAVA.setInt(1, id); + for (Entry 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); } - 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=?"); + } + + private Certificate(GigiResultSet rs) { + this.id = rs.getInt("id"); + dnString = rs.getString("subject"); + md = rs.getString("md"); + csrName = rs.getString("csr_name"); + crtName = rs.getString("crt_name"); + owner = CertificateOwner.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 +241,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 +253,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; } @@ -242,45 +274,12 @@ public class Certificate { * @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); - - 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(); - } + Notary.writeUserAgreement(actor, "CCA", "issue certificate", "", true, 0); - GigiPreparedStatement insertAVA = DatabaseConnection.getInstance().prepare("INSERT certAvas SET certid=?, name=?, value=?"); - insertAVA.setInt(1, id); - for (Entry 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(); return Job.sign(this, start, period); } @@ -293,6 +292,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) { @@ -334,7 +341,7 @@ public class Certificate { return md; } - public User getOwner() { + public CertificateOwner getOwner() { return owner; } @@ -346,10 +353,52 @@ 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 { + 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(); + if ( !rs.next()) { + return null; + } + 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 cache = new ObjectCache<>(); + + public synchronized static Certificate getById(int id) { + Certificate cacheRes = cache.get(id); + if (cacheRes != null) { + return cacheRes; + } + 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 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); + return c; } catch (IllegalArgumentException e) { } @@ -377,4 +426,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; + } }