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;
private int id;
- private int ownerId;
+ private User owner;
private String serial;
- private String dn;
-
private String md;
private String csrName;
private CertificateProfile profile;
- public Certificate(int ownerId, String dn, String md, String csr, CSRType csrType, CertificateProfile profile, SubjectAlternateName... sans) {
- this.ownerId = ownerId;
+ private HashMap<String, String> dn;
+
+ private String dnString;
+
+ public Certificate(User owner, HashMap<String, String> dn, String md, String csr, CSRType csrType, CertificateProfile profile, SubjectAlternateName... sans) throws GigiApiException {
+ if ( !owner.canIssue(profile)) {
+ 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;
}
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();
+ //
+ 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=?");
+ 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 {
}
- public CertificateStatus getStatus() throws SQLException {
+ public 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 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");
}
* @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);
+ Notary.writeUserAgreement(owner, "CCA", "issue certificate", "", true, 0);
- PreparedStatement inserter = DatabaseConnection.getInstance().prepare("INSERT INTO certs SET md=?, subject=?, csr_type=?, crt_name='', memid=?, profile=?");
+ GigiPreparedStatement inserter = DatabaseConnection.getInstance().prepare("INSERT INTO certs SET md=?, 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());
+ 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=?");
for (SubjectAlternateName subjectAlternateName : sans) {
san.setInt(1, id);
san.setString(2, subjectAlternateName.getName());
san.execute();
}
- PreparedStatement updater = DatabaseConnection.getInstance().prepare("UPDATE certs SET csr_name=? WHERE id=?");
+ GigiPreparedStatement insertAVA = DatabaseConnection.getInstance().prepare("INSERT certAvas SET certid=?, name=?, value=?");
+ insertAVA.setInt(1, id);
+ for (Entry<String, String> e : dn.entrySet()) {
+ insertAVA.setString(2, e.getKey());
+ insertAVA.setString(3, e.getValue());
+ insertAVA.execute();
+ }
+ File csrFile = KeyStorage.locateCsr(id);
+ csrName = csrFile.getPath();
+ FileOutputStream fos = new FileOutputStream(csrFile);
+ fos.write(csr.getBytes());
+ fos.close();
+
+ GigiPreparedStatement updater = DatabaseConnection.getInstance().prepare("UPDATE certs SET csr_name=? WHERE id=?");
updater.setString(1, csrName);
updater.setInt(2, id);
updater.execute();
}
- public Job revoke() throws SQLException {
+ public Job revoke() {
if (getStatus() != CertificateStatus.ISSUED) {
throw new IllegalStateException();
}
}
- public X509Certificate cert() throws IOException, GeneralSecurityException, SQLException {
+ public X509Certificate cert() throws IOException, GeneralSecurityException {
CertificateStatus status = getStatus();
if (status != CertificateStatus.ISSUED) {
throw new IllegalStateException(status + " is not wanted here.");
}
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<SubjectAlternateName> getSANs() {
return null;
}
+ public static String escapeAVA(String value) {
+
+ return value.replace("\\", "\\\\").replace("/", "\\/");
+ }
+
+ public static String stringifyDN(HashMap<String, String> contents) {
+ StringBuffer res = new StringBuffer();
+ for (Entry<String, String> i : contents.entrySet()) {
+ res.append("/" + i.getKey() + "=");
+ res.append(escapeAVA(i.getValue()));
+ }
+ return res.toString();
+ }
+
+ public static HashMap<String, String> buildDN(String... contents) {
+ HashMap<String, String> res = new HashMap<>();
+ for (int i = 0; i + 1 < contents.length; i += 2) {
+ res.put(contents[i], contents[i + 1]);
+ }
+ return res;
+ }
}
projects / gigi.git / blobdiff