X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FCertificate.java;h=e1bd2d6d498b60952ddecfbae14953faf4196527;hb=3252dc36fadd1a7e5f13bc01401e10565d61f635;hp=efe5aec5473d5c1dcb7e050002e26b2e6b45f689;hpb=28e686114d3a851a8f3163862b0c4ec4de3eacce;p=gigi.git

diff --git a/src/org/cacert/gigi/Certificate.java b/src/org/cacert/gigi/Certificate.java
index efe5aec5..e1bd2d6d 100644
--- a/src/org/cacert/gigi/Certificate.java
+++ b/src/org/cacert/gigi/Certificate.java
@@ -13,9 +13,16 @@ 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 {
+	public enum CSRType {
+		CSR, SPKAC;
+	}
+
 	private int id;
 	private int ownerId;
 	private String serial;
@@ -24,12 +31,14 @@ public class Certificate {
 	private String csrName;
 	private String crtName;
 	private String csr = null;
+	private CSRType csrType;
 
-	public Certificate(int ownerId, String dn, String md, String csr) {
+	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) {
@@ -59,47 +68,25 @@ public class Certificate {
 		 * This certificate is not in the database, has no id and only exists as
 		 * this java object.
 		 */
-		DRAFT(false),
-		/**
-		 * The certificate has been written to the database and is waiting for
-		 * the signer to sign it.
-		 */
-		SIGNING(true),
+		DRAFT(),
 		/**
 		 * The certificate has been signed. It is stored in the database.
 		 * {@link Certificate#cert()} is valid.
 		 */
-		ISSUED(false),
-		/**
-		 * The cetrificate is about to be revoked by the signer bot.
-		 */
-		BEING_REVOKED(true),
+		ISSUED(),
 
 		/**
 		 * The certificate has been revoked.
 		 */
-		REVOKED(false),
+		REVOKED(),
 
 		/**
 		 * If this certificate cannot be updated because an error happened in
 		 * the signer.
 		 */
-		ERROR(false);
-
-		private boolean unstable;
-
-		private CertificateStatus(boolean unstable) {
-			this.unstable = unstable;
-		}
+		ERROR();
 
-		/**
-		 * Checks, iff this certificate stage will be left by signer actions.
-		 * 
-		 * @return True, iff this certificate stage will be left by signer
-		 *         actions.
-		 */
-		public boolean isUnstable() {
-			return unstable;
+		private CertificateStatus() {
 		}
 
 	}
@@ -109,81 +96,59 @@ public class Certificate {
 			return CertificateStatus.DRAFT;
 		}
 		PreparedStatement searcher = DatabaseConnection.getInstance().prepare(
-			"SELECT crt_name, created, revoked, warning 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.getInt(4) >= 3) {
-			return CertificateStatus.ERROR;
-		}
 
-		if (rs.getString(2) == null) {
-			return CertificateStatus.SIGNING;
-		}
 		crtName = rs.getString(1);
+		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.BEING_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='', memid=?");
-			inserter.setString(1, md);
-			inserter.setString(2, dn);
-			inserter.setInt(3, 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();
-		} 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);
 
 	}
 
@@ -215,6 +180,11 @@ public class Certificate {
 	}
 
 	public String getSerial() {
+		try {
+			getStatus();
+		} catch (SQLException e) {
+			e.printStackTrace();
+		} // poll changes
 		return serial;
 	}