X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FCertificate.java;h=fc92b309870c171eafb34e0071eb1d5edc2a542d;hb=03d27b5bdaea6253e674cdf2779465873b657900;hp=6882b8113018c4c41af40bf54f5844f176a9878b;hpb=099a62e97ba2f7a42f0e400c4343a9838acf5eb0;p=gigi.git diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java index 6882b811..fc92b309 100644 --- a/src/org/cacert/gigi/dbObjects/Certificate.java +++ b/src/org/cacert/gigi/dbObjects/Certificate.java @@ -132,8 +132,10 @@ public class Certificate { private String dnString; + private CACertificate ca; + public Certificate(User owner, HashMap 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; @@ -149,25 +151,21 @@ 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; - - GigiPreparedStatement ps2 = DatabaseConnection.getInstance().prepare("SELECT contents, type FROM `subjectAlternativeNames` WHERE certId=?"); + 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); GigiResultSet rs2 = ps2.executeQuery(); sans = new LinkedList<>(); @@ -210,7 +208,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 +220,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; } @@ -248,15 +247,15 @@ public class Certificate { } 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); + 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=?"); + 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()); @@ -264,7 +263,7 @@ public class Certificate { san.execute(); } - GigiPreparedStatement insertAVA = DatabaseConnection.getInstance().prepare("INSERT certAvas SET certid=?, name=?, value=?"); + 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()); @@ -277,7 +276,7 @@ public class Certificate { fos.write(csr.getBytes("UTF-8")); } - GigiPreparedStatement updater = DatabaseConnection.getInstance().prepare("UPDATE certs SET csr_name=? WHERE id=?"); + GigiPreparedStatement updater = DatabaseConnection.getInstance().prepare("UPDATE `certs` SET `csr_name`=? WHERE id=?"); updater.setString(1, csrName); updater.setInt(2, id); updater.execute(); @@ -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) { @@ -352,7 +359,27 @@ public class Certificate { } // TODO caching? 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 `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) { } @@ -380,4 +407,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; + } }