X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FCertificate.java;h=d7af542b674134f0045e57a162077716bac49b17;hb=943d8e7ed0ea5a9d56e7e694a3cbd849c52bad16;hp=7a13b45f945d1b1935032102ac0732d18b7f9411;hpb=05e8bb67c3407cbecbb528db16b1608d8534907e;p=gigi.git

diff --git a/src/org/cacert/gigi/Certificate.java b/src/org/cacert/gigi/Certificate.java
index 7a13b45f..d7af542b 100644
--- a/src/org/cacert/gigi/Certificate.java
+++ b/src/org/cacert/gigi/Certificate.java
@@ -19,194 +19,198 @@ 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;
-	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();
-		}
-	}
-
-	public enum CertificateStatus {
-		/**
-		 * 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(),
-
-		/**
-		 * The certificate has been revoked.
-		 */
-		REVOKED(),
-
-		/**
-		 * 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, serial FROM emailcerts WHERE id=?");
-		searcher.setInt(1, id);
-		ResultSet 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) {
-			return CertificateStatus.DRAFT;
-		}
-		if (rs.getTime(2) != null && rs.getTime(3) == null) {
-			return CertificateStatus.ISSUED;
-		}
-		return CertificateStatus.REVOKED;
-	}
-
-	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);
-		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 Job revoke() throws SQLException {
-		if (getStatus() != CertificateStatus.ISSUED) {
-			throw new IllegalStateException();
-		}
-		return Job.submit(this, JobType.REVOKE);
-
-	}
-
-	public X509Certificate cert() throws IOException, GeneralSecurityException, SQLException {
-		CertificateStatus status = getStatus();
-		if (status != CertificateStatus.ISSUED) {
-			throw new IllegalStateException(status + " is not wanted here.");
-		}
-		InputStream is = null;
-		X509Certificate crt = null;
-		try {
-			is = new FileInputStream(crtName);
-			CertificateFactory cf = CertificateFactory.getInstance("X.509");
-			crt = (X509Certificate) cf.generateCertificate(is);
-		} finally {
-			if (is != null) {
-				is.close();
-			}
-		}
-		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;
-	}
+
+    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();
+        }
+    }
+
+    public enum CertificateStatus {
+        /**
+         * 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(),
+
+        /**
+         * The certificate has been revoked.
+         */
+        REVOKED(),
+
+        /**
+         * 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, serial FROM emailcerts WHERE id=?");
+        searcher.setInt(1, id);
+        ResultSet 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) {
+            return CertificateStatus.DRAFT;
+        }
+        if (rs.getTime(2) != null && rs.getTime(3) == null) {
+            return CertificateStatus.ISSUED;
+        }
+        return CertificateStatus.REVOKED;
+    }
+
+    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);
+        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 Job revoke() throws SQLException {
+        if (getStatus() != CertificateStatus.ISSUED) {
+            throw new IllegalStateException();
+        }
+        return Job.submit(this, JobType.REVOKE);
+
+    }
+
+    public X509Certificate cert() throws IOException, GeneralSecurityException, SQLException {
+        CertificateStatus status = getStatus();
+        if (status != CertificateStatus.ISSUED) {
+            throw new IllegalStateException(status + " is not wanted here.");
+        }
+        InputStream is = null;
+        X509Certificate crt = null;
+        try {
+            is = new FileInputStream(crtName);
+            CertificateFactory cf = CertificateFactory.getInstance("X.509");
+            crt = (X509Certificate) cf.generateCertificate(is);
+        } finally {
+            if (is != null) {
+                is.close();
+            }
+        }
+        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;
+    }
 
 }