X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FCertificate.java;h=8ee811db5e20a77c1b0c16c842d8a89b8669fc1e;hb=b5e3f4933a9cd240d39ed906577c2c93a48529d1;hp=59d0aded9b329c9396c5690d5690c5d84f1b3f3e;hpb=e409ba881965634f63f0b67824bc93dda4ec4327;p=gigi.git diff --git a/src/org/cacert/gigi/dbObjects/Certificate.java b/src/org/cacert/gigi/dbObjects/Certificate.java index 59d0aded..8ee811db 100644 --- a/src/org/cacert/gigi/dbObjects/Certificate.java +++ b/src/org/cacert/gigi/dbObjects/Certificate.java @@ -9,16 +9,17 @@ import java.security.GeneralSecurityException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.sql.Date; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.LinkedList; 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.util.Job; import org.cacert.gigi.util.KeyStorage; import org.cacert.gigi.util.Notary; @@ -109,12 +110,10 @@ public class Certificate { private int id; - private int ownerId; + private User owner; private String serial; - private String dn; - private String md; private String csrName; @@ -129,9 +128,22 @@ public class Certificate { private CertificateProfile profile; - public Certificate(int ownerId, String dn, String md, String csr, CSRType csrType, CertificateProfile profile, SubjectAlternateName... sans) { - this.ownerId = ownerId; + private HashMap dn; + + 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 ( !profile.canBeIssuedBy(owner)) { + 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"); + } + dnString = stringifyDN(dn); this.md = md; this.csr = csr; this.csrType = csrType; @@ -139,36 +151,30 @@ public class Certificate { this.sans = Arrays.asList(sans); } - private Certificate(String serial) { - try { - PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id,subject, md, csr_name, crt_name,memid, profile FROM `certs` WHERE serial=?"); - ps.setString(1, serial); - ResultSet rs = ps.executeQuery(); - if ( !rs.next()) { - throw new IllegalArgumentException("Invalid mid " + serial); - } - this.id = rs.getInt(1); - dn = rs.getString(2); - md = rs.getString(3); - csrName = rs.getString(4); - crtName = rs.getString(5); - ownerId = rs.getInt(6); - profile = CertificateProfile.getById(rs.getInt(7)); - this.serial = serial; - - PreparedStatement ps2 = DatabaseConnection.getInstance().prepare("SELECT contents, type FROM `subjectAlternativeNames` WHERE certId=?"); - ps2.setInt(1, id); - ResultSet 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(); - } catch (SQLException e) { - e.printStackTrace(); + 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"); + 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<>(); + while (rs2.next()) { + sans.add(new SubjectAlternateName(SANType.valueOf(rs2.getString("type").toUpperCase()), rs2.getString("contents"))); } + rs2.close(); + + rs.close(); } public enum CertificateStatus { @@ -198,23 +204,24 @@ public class Certificate { } - public CertificateStatus getStatus() throws SQLException { + public synchronized CertificateStatus getStatus() { if (id == 0) { return CertificateStatus.DRAFT; } - PreparedStatement 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); - ResultSet rs = searcher.executeQuery(); + GigiResultSet rs = searcher.executeQuery(); if ( !rs.next()) { throw new IllegalStateException("Certificate not in Database"); } crtName = rs.getString(1); serial = rs.getString(4); - if (rs.getTime(2) == null) { + if (rs.getTimestamp(2) == null) { return CertificateStatus.DRAFT; } - if (rs.getTime(2) != null && rs.getTime(3) == null) { + ca = CACertificate.getById(rs.getInt("caid")); + if (rs.getTimestamp(2) != null && rs.getTimestamp(3) == null) { return CertificateStatus.ISSUED; } return CertificateStatus.REVOKED; @@ -231,33 +238,24 @@ public class Certificate { * @return A job which can be used to monitor the progress of this task. * @throws IOException * for problems with writing the CSR/SPKAC - * @throws SQLException - * for problems with writing to the DB * @throws GigiApiException * if the period is bogus */ - public Job issue(Date start, String period) throws IOException, SQLException, GigiApiException { + public Job issue(Date start, String period) throws IOException, GigiApiException { if (getStatus() != CertificateStatus.DRAFT) { throw new IllegalStateException(); } - Notary.writeUserAgreement(ownerId, "CCA", "issue certificate", "", true, 0); - - PreparedStatement inserter = DatabaseConnection.getInstance().prepare("INSERT INTO certs SET md=?, subject=?, csr_type=?, crt_name='', memid=?, profile=?"); - inserter.setString(1, md); - inserter.setString(2, dn); - inserter.setString(3, csrType.toString()); - inserter.setInt(4, ownerId); - inserter.setInt(5, profile.getId()); + Notary.writeUserAgreement(owner, "CCA", "issue certificate", "", true, 0); + + 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 = DatabaseConnection.lastInsertId(inserter); - File csrFile = KeyStorage.locateCsr(id); - csrName = csrFile.getPath(); - FileOutputStream fos = new FileOutputStream(csrFile); - fos.write(csr.getBytes()); - fos.close(); + id = inserter.lastInsertId(); - // TODO draft to insert SANs - PreparedStatement 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()); @@ -265,7 +263,20 @@ public class Certificate { san.execute(); } - PreparedStatement updater = DatabaseConnection.getInstance().prepare("UPDATE certs SET csr_name=? WHERE id=?"); + 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(); @@ -273,7 +284,7 @@ public class Certificate { } - public Job revoke() throws SQLException { + public Job revoke() { if (getStatus() != CertificateStatus.ISSUED) { throw new IllegalStateException(); } @@ -281,9 +292,17 @@ public class Certificate { } - public X509Certificate cert() throws IOException, GeneralSecurityException, SQLException { + 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.ISSUED) { + if (status != CertificateStatus.REVOKED && status != CertificateStatus.ISSUED) { throw new IllegalStateException(status + " is not wanted here."); } InputStream is = null; @@ -309,24 +328,21 @@ public class Certificate { } public String getSerial() { - try { - getStatus(); - } catch (SQLException e) { - e.printStackTrace(); - } // poll changes + getStatus(); + // poll changes return serial; } public String getDistinguishedName() { - return dn; + return dnString; } public String getMessageDigest() { return md; } - public int getOwnerId() { - return ownerId; + public User getOwner() { + return owner; } public List getSANs() { @@ -338,13 +354,70 @@ public class Certificate { } public static Certificate getBySerial(String serial) { + if (serial == null || "".equals(serial)) { + return null; + } // 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) { } return null; } + public static String escapeAVA(String value) { + + return value.replace("\\", "\\\\").replace("/", "\\/"); + } + + public static String stringifyDN(HashMap contents) { + StringBuffer res = new StringBuffer(); + for (Entry i : contents.entrySet()) { + res.append("/" + i.getKey() + "="); + res.append(escapeAVA(i.getValue())); + } + return res.toString(); + } + + public static HashMap buildDN(String... contents) { + HashMap res = new HashMap<>(); + for (int i = 0; i + 1 < contents.length; i += 2) { + res.put(contents[i], contents[i + 1]); + } + 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; + } }