X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fcacert%2Fgigi%2FCertificate.java;h=e1bd2d6d498b60952ddecfbae14953faf4196527;hb=3252dc36fadd1a7e5f13bc01401e10565d61f635;hp=c5aaf3fdd3f650f1f89f37aaaf9973bce36f09e1;hpb=ab88602bac4ff5c5540765a85a2013ecadb070df;p=gigi.git diff --git a/src/org/cacert/gigi/Certificate.java b/src/org/cacert/gigi/Certificate.java index c5aaf3fd..e1bd2d6d 100644 --- a/src/org/cacert/gigi/Certificate.java +++ b/src/org/cacert/gigi/Certificate.java @@ -13,121 +13,146 @@ import java.sql.ResultSet; import java.sql.SQLException; import org.cacert.gigi.database.DatabaseConnection; +import org.cacert.gigi.util.Job; +import org.cacert.gigi.util.Job.JobType; import org.cacert.gigi.util.KeyStorage; +import org.cacert.gigi.util.Notary; public class Certificate { - int id; - int serial; - String dn; - String md; - String csrName; - String crtName; - String csr = null; - public Certificate(String dn, String md, String csr) { + public enum CSRType { + CSR, SPKAC; + } + + private int id; + private int ownerId; + private String serial; + private String dn; + private String md; + private String csrName; + private String crtName; + private String csr = null; + private CSRType csrType; + + public Certificate(int ownerId, String dn, String md, String csr, CSRType csrType) { + this.ownerId = ownerId; this.dn = dn; this.md = md; this.csr = csr; + this.csrType = csrType; + } + + private Certificate(String serial) { + try { + PreparedStatement ps = DatabaseConnection.getInstance().prepare( + "SELECT id,subject, md, csr_name, crt_name,memid FROM `emailcerts` 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); + this.serial = serial; + rs.close(); + } catch (SQLException e) { + e.printStackTrace(); + } } - // created, modified, revoked, expire public enum CertificateStatus { - DRAFT(false), BEEING_ISSUED(true), ISSUED(false), BEEING_REVOKED(true), REVOKED( - false); + /** + * This certificate is not in the database, has no id and only exists as + * this java object. + */ + DRAFT(), + /** + * The certificate has been signed. It is stored in the database. + * {@link Certificate#cert()} is valid. + */ + ISSUED(), - boolean unstable; + /** + * The certificate has been revoked. + */ + REVOKED(), - private CertificateStatus(boolean unstable) { - this.unstable = unstable; - } - public boolean isUnstable() { - return unstable; + /** + * If this certificate cannot be updated because an error happened in + * the signer. + */ + ERROR(); + + private CertificateStatus() { } } + public CertificateStatus getStatus() throws SQLException { if (id == 0) { return CertificateStatus.DRAFT; } PreparedStatement searcher = DatabaseConnection.getInstance().prepare( - "SELECT crt_name, created, revoked FROM emailcerts WHERE id=?"); + "SELECT crt_name, created, revoked, serial FROM emailcerts WHERE id=?"); searcher.setInt(1, id); ResultSet rs = searcher.executeQuery(); if (!rs.next()) { throw new IllegalStateException("Certificate not in Database"); } - if (rs.getString(2) == null) { - return CertificateStatus.BEEING_ISSUED; - } + crtName = rs.getString(1); - System.out.println(crtName); + serial = rs.getString(4); + if (rs.getTime(2) == null) { + return CertificateStatus.DRAFT; + } if (rs.getTime(2) != null && rs.getTime(3) == null) { return CertificateStatus.ISSUED; } - if (rs.getTime(2) != null - && rs.getString(3).equals("1970-01-01 00:00:00.0")) { - return CertificateStatus.BEEING_REVOKED; - } return CertificateStatus.REVOKED; } - public void issue() throws IOException { - try { - if (getStatus() != CertificateStatus.DRAFT) { - throw new IllegalStateException(); - } - PreparedStatement inserter = DatabaseConnection - .getInstance() - .prepare( - "INSERT INTO emailcerts SET md=?, subject=?, coll_found=0, crt_name=''"); - inserter.setString(1, md); - inserter.setString(2, dn); - 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(); - - PreparedStatement updater = DatabaseConnection.getInstance() - .prepare("UPDATE emailcerts SET csr_name=? WHERE id=?"); - updater.setString(1, csrName); - updater.setInt(2, id); - updater.execute(); - } catch (SQLException e) { - e.printStackTrace(); + public Job issue() throws IOException, SQLException { + if (getStatus() != CertificateStatus.DRAFT) { + throw new IllegalStateException(); } + Notary.writeUserAgreement(ownerId, "CCA", "issue certificate", "", true, 0); + + PreparedStatement inserter = DatabaseConnection.getInstance().prepare( + "INSERT INTO emailcerts SET md=?, subject=?, csr_type=?, crt_name='', memid=?"); + inserter.setString(1, md); + System.out.println(csrType.toString()); + inserter.setString(2, dn); + inserter.setString(3, csrType.toString()); + inserter.setInt(4, ownerId); + 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(); + + PreparedStatement updater = DatabaseConnection.getInstance().prepare( + "UPDATE emailcerts SET csr_name=? WHERE id=?"); + updater.setString(1, csrName); + updater.setInt(2, id); + updater.execute(); + return Job.submit(this, JobType.SIGN); } - public boolean waitFor(int max) throws SQLException, InterruptedException { - long start = System.currentTimeMillis(); - while (getStatus().isUnstable()) { - if (max != 0 && System.currentTimeMillis() - start > max) { - return false; - } - Thread.sleep((long) (2000 + Math.random() * 2000)); - } - return true; - } - public void revoke() { - try { - if (getStatus() != CertificateStatus.ISSUED) { - throw new IllegalStateException(); - } - PreparedStatement inserter = DatabaseConnection - .getInstance() - .prepare( - "UPDATE emailcerts SET revoked = '1970-01-01' WHERE id=?"); - inserter.setInt(1, id); - inserter.execute(); - } catch (SQLException e) { - e.printStackTrace(); + + public Job revoke() throws SQLException { + if (getStatus() != CertificateStatus.ISSUED) { + throw new IllegalStateException(); } + return Job.submit(this, JobType.REVOKE); } - public X509Certificate cert() throws IOException, GeneralSecurityException, - SQLException { + public X509Certificate cert() throws IOException, GeneralSecurityException, SQLException { CertificateStatus status = getStatus(); if (status != CertificateStatus.ISSUED) { throw new IllegalStateException(status + " is not wanted here."); @@ -145,8 +170,44 @@ public class Certificate { } return crt; } + public Certificate renew() { return null; } + public int getId() { + return id; + } + + public String getSerial() { + try { + getStatus(); + } catch (SQLException e) { + e.printStackTrace(); + } // poll changes + return serial; + } + + public String getDistinguishedName() { + return dn; + } + + public String getMessageDigest() { + return md; + } + + public int getOwnerId() { + return ownerId; + } + + public static Certificate getBySerial(String serial) { + // TODO caching? + try { + return new Certificate(serial); + } catch (IllegalArgumentException e) { + + } + return null; + } + }