X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FCertificate.java;h=12aa2993f3b12cbdbec7122e5248cc1daa7f0bd0;hp=c0fb6285f57b3ac422db274743106916ca4c2baf;hb=0b86fb147b4a61f315770fa5bba4466ca18ddfa8;hpb=226dd3a5e589ad8269585a0767819619166eebf4 diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java index c0fb6285..12aa2993 100644 --- a/src/org/cacert/gigi/dbObjects/Certificate.java +++ b/src/org/cacert/gigi/dbObjects/Certificate.java @@ -17,16 +17,16 @@ import java.util.List; import java.util.Map.Entry; import org.cacert.gigi.GigiApiException; -import org.cacert.gigi.database.DatabaseConnection; +import org.cacert.gigi.database.DBEnum; import org.cacert.gigi.database.GigiPreparedStatement; import org.cacert.gigi.database.GigiResultSet; -import org.cacert.gigi.util.Job; +import org.cacert.gigi.output.template.Outputable; +import org.cacert.gigi.output.template.TranslateCommand; import org.cacert.gigi.util.KeyStorage; -import org.cacert.gigi.util.Notary; -public class Certificate { +public class Certificate implements IdCachable { - public enum SANType { + public enum SANType implements DBEnum { EMAIL("email"), DNS("DNS"); private final String opensslName; @@ -38,6 +38,11 @@ public class Certificate { public String getOpensslName() { return opensslName; } + + @Override + public String getDBName() { + return opensslName; + } } public static class SubjectAlternateName implements Comparable { @@ -110,11 +115,11 @@ public class Certificate { private int id; - private User owner; + private CertificateOwner owner; private String serial; - private String md; + private Digest md; private String csrName; @@ -132,14 +137,16 @@ 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, 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; this.dn = dn; if (dn.size() == 0) { - throw new GigiApiException("DN must not be empty"); + throw new GigiApiException("DN must not be empty."); } dnString = stringifyDN(dn); this.md = md; @@ -147,36 +154,67 @@ public class Certificate { this.csrType = csrType; this.profile = profile; this.sans = Arrays.asList(sans); + synchronized (Certificate.class) { + + try (GigiPreparedStatement inserter = new GigiPreparedStatement("INSERT INTO certs SET md=?::`mdType`, csr_type=?::`csrType`, crt_name='', memid=?, profile=?")) { + inserter.setString(1, md.toString().toLowerCase()); + inserter.setString(2, this.csrType.toString()); + inserter.setInt(3, owner.getId()); + inserter.setInt(4, profile.getId()); + inserter.execute(); + id = inserter.lastInsertId(); + } + + try (GigiPreparedStatement san = new GigiPreparedStatement("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(); + } + } + + try (GigiPreparedStatement insertAVA = new GigiPreparedStatement("INSERT INTO `certAvas` SET `certId`=?, name=?, value=?")) { + insertAVA.setInt(1, id); + for (Entry e : this.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(this.csr.getBytes("UTF-8")); + } + try (GigiPreparedStatement updater = new GigiPreparedStatement("UPDATE `certs` SET `csr_name`=? WHERE id=?")) { + updater.setString(1, csrName); + updater.setInt(2, id); + updater.execute(); + } + + cache.put(this); + } } - 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); - } - 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=?"); - ps2.setInt(1, id); - GigiResultSet rs2 = ps2.executeQuery(); - sans = new LinkedList<>(); - while (rs2.next()) { - sans.add(new SubjectAlternateName(SANType.valueOf(rs2.getString("type").toUpperCase()), rs2.getString("contents"))); - } - rs2.close(); - - rs.close(); + private Certificate(GigiResultSet rs) { + this.id = rs.getInt("id"); + dnString = rs.getString("subject"); + md = Digest.valueOf(rs.getString("md").toUpperCase()); + 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"); + + try (GigiPreparedStatement ps2 = new GigiPreparedStatement("SELECT `contents`, `type` FROM `subjectAlternativeNames` WHERE `certId`=?")) { + ps2.setInt(1, id); + GigiResultSet rs2 = ps2.executeQuery(); + sans = new LinkedList<>(); + while (rs2.next()) { + sans.add(new SubjectAlternateName(SANType.valueOf(rs2.getString("type").toUpperCase()), rs2.getString("contents"))); + } + } } public enum CertificateStatus { @@ -184,48 +222,56 @@ public class Certificate { * This certificate is not in the database, has no id and only exists as * this java object. */ - DRAFT(), + DRAFT("draft"), /** * The certificate has been signed. It is stored in the database. * {@link Certificate#cert()} is valid. */ - ISSUED(), + ISSUED("issued"), /** * The certificate has been revoked. */ - REVOKED(), + REVOKED("revoked"), /** * If this certificate cannot be updated because an error happened in * the signer. */ - ERROR(); + ERROR("error"); - private CertificateStatus() {} + private final Outputable name; - } + private CertificateStatus(String codename) { + this.name = new TranslateCommand(codename); - public synchronized CertificateStatus getStatus() { - if (id == 0) { - return CertificateStatus.DRAFT; - } - GigiPreparedStatement searcher = DatabaseConnection.getInstance().prepare("SELECT crt_name, created, revoked, serial FROM certs WHERE id=?"); - searcher.setInt(1, id); - GigiResultSet rs = searcher.executeQuery(); - if ( !rs.next()) { - throw new IllegalStateException("Certificate not in Database"); } - crtName = rs.getString(1); - serial = rs.getString(4); - if (rs.getTimestamp(2) == null) { - return CertificateStatus.DRAFT; + public Outputable getName() { + return name; } - if (rs.getTimestamp(2) != null && rs.getTimestamp(3) == null) { - return CertificateStatus.ISSUED; + + } + + public synchronized CertificateStatus getStatus() { + try (GigiPreparedStatement searcher = new GigiPreparedStatement("SELECT crt_name, created, revoked, serial, caid FROM certs WHERE id=?")) { + searcher.setInt(1, id); + GigiResultSet rs = searcher.executeQuery(); + if ( !rs.next()) { + throw new IllegalStateException("Certificate not in Database"); + } + + crtName = rs.getString(1); + serial = rs.getString(4); + 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; + } + return CertificateStatus.REVOKED; } - return CertificateStatus.REVOKED; } /** @@ -242,45 +288,11 @@ 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(); - } - - 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 +305,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) { @@ -330,11 +350,11 @@ public class Certificate { return dnString; } - public String getMessageDigest() { + public Digest getMessageDigest() { return md; } - public User getOwner() { + public CertificateOwner getOwner() { return owner; } @@ -346,10 +366,49 @@ 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; + } + String concat = "string_agg(concat('/', `name`, '=', REPLACE(REPLACE(value, '\\\\', '\\\\\\\\'), '/', '\\\\/')), '')"; + try (GigiPreparedStatement ps = new GigiPreparedStatement("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; + } + } + + 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, '\\\\', '\\\\\\\\'), '/', '\\\\/')), '')"; + try (GigiPreparedStatement ps = new GigiPreparedStatement("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 +436,67 @@ public class Certificate { } return res; } + + public java.util.Date getRevocationDate() { + if (getStatus() == CertificateStatus.REVOKED) { + try (GigiPreparedStatement prep = new GigiPreparedStatement("SELECT revoked FROM certs WHERE id=?")) { + prep.setInt(1, getId()); + GigiResultSet res = prep.executeQuery(); + if (res.next()) { + return new java.util.Date(res.getDate("revoked").getTime()); + } + } + } + return null; + } + + public void setLoginEnabled(boolean activate) { + if (activate) { + if ( !isLoginEnabled()) { + try (GigiPreparedStatement prep = new GigiPreparedStatement("INSERT INTO `logincerts` SET `id`=?")) { + prep.setInt(1, id); + prep.execute(); + } + } + } else { + try (GigiPreparedStatement prep = new GigiPreparedStatement("DELETE FROM `logincerts` WHERE `id`=?")) { + prep.setInt(1, id); + prep.execute(); + } + } + } + + public boolean isLoginEnabled() { + try (GigiPreparedStatement prep = new GigiPreparedStatement("SELECT 1 FROM `logincerts` WHERE `id`=?")) { + prep.setInt(1, id); + GigiResultSet res = prep.executeQuery(); + return res.next(); + } + } + + public static Certificate[] findBySerialPattern(String serial) { + try (GigiPreparedStatement prep = new GigiPreparedStatement("SELECT `id` FROM `certs` WHERE `serial` LIKE ? GROUP BY `id` LIMIT 100", true)) { + prep.setString(1, serial); + return fetchCertsToArray(prep); + } + } + + public static Certificate[] findBySANPattern(String request, SANType type) { + try (GigiPreparedStatement prep = new GigiPreparedStatement("SELECT `certId` FROM `subjectAlternativeNames` WHERE `contents` LIKE ? and `type`=?::`SANType` GROUP BY `certId` LIMIT 100", true)) { + prep.setString(1, request); + prep.setEnum(2, type); + return fetchCertsToArray(prep); + } + } + + private static Certificate[] fetchCertsToArray(GigiPreparedStatement prep) { + GigiResultSet res = prep.executeQuery(); + res.last(); + Certificate[] certs = new Certificate[res.getRow()]; + res.beforeFirst(); + for (int i = 0; res.next(); i++) { + certs[i] = Certificate.getById(res.getInt(1)); + } + return certs; + } }