X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FCertificate.java;h=541272bdae1fb43a7e9b60186aaed84054309447;hb=ec155eec51606c19970c9099ef23f700fb6aa53a;hp=7dabe8cc56087cb52ea5e483720190b06db509a1;hpb=038e2158a52d69c5cb4135f28f543e94d5e5ac47;p=gigi.git diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java index 7dabe8cc..541272bd 100644 --- a/src/org/cacert/gigi/dbObjects/Certificate.java +++ b/src/org/cacert/gigi/dbObjects/Certificate.java @@ -17,9 +17,10 @@ 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.GigiPreparedStatement; import org.cacert.gigi.database.GigiResultSet; +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; @@ -113,7 +114,7 @@ public class Certificate implements IdCachable { private String serial; - private String md; + private Digest md; private String csrName; @@ -133,7 +134,7 @@ public class Certificate implements IdCachable { private CACertificate ca; - public Certificate(CertificateOwner owner, User actor, HashMap dn, String md, String csr, CSRType csrType, CertificateProfile profile, SubjectAlternateName... sans) throws GigiApiException, IOException { + 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."); } @@ -150,39 +151,42 @@ public class Certificate implements IdCachable { 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(); + 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, csrType.toString()); + inserter.setInt(3, owner.getId()); + inserter.setInt(4, profile.getId()); + inserter.execute(); + id = inserter.lastInsertId(); } - 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(); + 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 : 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(); + 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); } @@ -191,23 +195,21 @@ public class Certificate implements IdCachable { private Certificate(GigiResultSet rs) { 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 = 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<>(); - while (rs2.next()) { - sans.add(new SubjectAlternateName(SANType.valueOf(rs2.getString("type").toUpperCase()), rs2.getString("contents"))); + 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"))); + } } - rs2.close(); - - rs.close(); } public enum CertificateStatus { @@ -215,46 +217,56 @@ public class Certificate implements IdCachable { * 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() { - 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()) { - 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; } - ca = CACertificate.getById(rs.getInt("caid")); - 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; } /** @@ -334,7 +346,7 @@ public class Certificate implements IdCachable { return dnString; } - public String getMessageDigest() { + public Digest getMessageDigest() { return md; } @@ -354,9 +366,8 @@ public class Certificate implements IdCachable { 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`"); + 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()) { @@ -370,10 +381,7 @@ public class Certificate implements IdCachable { Certificate certificate = new Certificate(rs); cache.put(certificate); return certificate; - } catch (IllegalArgumentException e) { - } - return null; } private static ObjectCache cache = new ObjectCache<>(); @@ -386,16 +394,17 @@ public class Certificate implements IdCachable { 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 certs.id=? GROUP BY certs.id"); - ps.setInt(1, id); - GigiResultSet rs = ps.executeQuery(); - if ( !rs.next()) { - return null; - } + 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; + Certificate c = new Certificate(rs); + cache.put(c); + return c; + } } catch (IllegalArgumentException e) { } @@ -426,12 +435,12 @@ public class Certificate implements IdCachable { 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()); + 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;