X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FIssueCertificateForm.java;h=cf10c612fdcc61a1efa9525005e89a3c13ca90dd;hb=c330d2ce37cf4959f2281621f1af097be8c1a48b;hp=e470f21b515e9e6aa708ec9827c6c27c7eea2ba8;hpb=943d8e7ed0ea5a9d56e7e694a3cbd849c52bad16;p=gigi.git
diff --git a/src/org/cacert/gigi/pages/account/IssueCertificateForm.java b/src/org/cacert/gigi/pages/account/IssueCertificateForm.java
index e470f21b..cf10c612 100644
--- a/src/org/cacert/gigi/pages/account/IssueCertificateForm.java
+++ b/src/org/cacert/gigi/pages/account/IssueCertificateForm.java
@@ -15,18 +15,26 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.cacert.gigi.Certificate;
+import org.cacert.gigi.Certificate.CSRType;
import org.cacert.gigi.Digest;
import org.cacert.gigi.EmailAddress;
+import org.cacert.gigi.GigiApiException;
import org.cacert.gigi.Language;
import org.cacert.gigi.User;
-import org.cacert.gigi.Certificate.CSRType;
+import org.cacert.gigi.crypto.SPKAC;
import org.cacert.gigi.output.Form;
import org.cacert.gigi.output.template.HashAlgorithms;
import org.cacert.gigi.output.template.IterableDataset;
import org.cacert.gigi.output.template.Template;
import org.cacert.gigi.pages.LoginPage;
+import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.util.PEM;
+import org.cacert.gigi.util.RandomToken;
import sun.security.pkcs10.PKCS10;
+import sun.security.util.DerInputStream;
+import sun.security.util.DerValue;
+import sun.security.x509.AlgorithmId;
/**
* This class represents a form that is used for issuing certificates. This
@@ -44,9 +52,14 @@ public class IssueCertificateForm extends Form {
private final static Template t = new Template(IssueCertificateForm.class.getResource("IssueCertificateForm.templ"));
+ private final static Template tIni = new Template(MailCertificateAdd.class.getResource("RequestCertificate.templ"));
+
+ String spkacChallange;
+
public IssueCertificateForm(HttpServletRequest hsr) {
super(hsr);
- u = LoginPage.getUser(hsr);
+ u = Page.getUser(hsr);
+ spkacChallange = RandomToken.generateToken(16);
}
Certificate result;
@@ -62,70 +75,107 @@ public class IssueCertificateForm extends Form {
String csr = req.getParameter("CSR");
String spkac = req.getParameter("SPKAC");
try {
- if (csr != null) {
- PKCS10 parsed = parseCSR(csr);
- out.println(parsed.getSubjectName().getCommonName());
- out.println(parsed.getSubjectName().getCountry());
- out.println("CSR DN: " + parsed.getSubjectName() + "
");
- PublicKey pk = parsed.getSubjectPublicKeyInfo();
- out.println("Type: " + pk.getAlgorithm() + "
");
- if (pk instanceof RSAPublicKey) {
- out.println("Exponent: " + ((RSAPublicKey) pk).getPublicExponent() + "
");
- out.println("Length: " + ((RSAPublicKey) pk).getModulus().bitLength());
- } else if (pk instanceof DSAPublicKey) {
- DSAPublicKey dpk = (DSAPublicKey) pk;
- out.println("Length: " + dpk.getY().bitLength() + "
");
- out.println(dpk.getParams());
- } else if (pk instanceof ECPublicKey) {
- ECPublicKey epk = (ECPublicKey) pk;
- out.println("Length-x: " + epk.getW().getAffineX().bitLength() + "
");
- out.println("Length-y: " + epk.getW().getAffineY().bitLength() + "
");
- out.println(epk.getParams().getCurve());
- }
- out.println("
digest: sha256
");
- this.csr = csr;
- this.csrType = CSRType.CSR;
- } else if (spkac != null) {
- this.csr = "SPKAC=" + spkac.replaceAll("[\r\n]", "");
- this.csrType = CSRType.SPKAC;
- } else {
- login = "1".equals(req.getParameter("login"));
- String hashAlg = req.getParameter("hash_alg");
- if (hashAlg != null) {
- selectedDigest = Digest.valueOf(hashAlg);
- }
- if (req.getParameter("CCA") == null) {
- outputError(out, req, "You need to accept the CCA.");
- return false;
- }
- System.out.println("issuing " + selectedDigest);
- result = new Certificate(LoginPage.getUser(req).getId(), "/commonName=CAcert WoT User", selectedDigest.toString(), this.csr, this.csrType);
- try {
+ try {
+ if (csr != null) {
+ byte[] data = PEM.decode("(NEW )?CERTIFICATE REQUEST", csr);
+ PKCS10 parsed = new PKCS10(data);
+
+ out.println(parsed.getSubjectName().getCommonName());
+ out.println(parsed.getSubjectName().getCountry());
+ out.println("CSR DN: " + parsed.getSubjectName() + "
");
+ PublicKey pk = parsed.getSubjectPublicKeyInfo();
+ checkKeyStrength(pk, out);
+ String sign = getSignatureAlgorithm(data);
+ out.println("
digest: " + sign + "
");
+
+ this.csr = csr;
+ this.csrType = CSRType.CSR;
+ } else if (spkac != null) {
+ String cleanedSPKAC = spkac.replaceAll("[\r\n]", "");
+ byte[] data = Base64.getDecoder().decode(cleanedSPKAC);
+ SPKAC parsed = new SPKAC(data);
+ if ( !parsed.getChallenge().equals(spkacChallange)) {
+ throw new GigiApiException("Challange mismatch");
+ }
+ checkKeyStrength(parsed.getPubkey(), out);
+ String sign = getSignatureAlgorithm(data);
+ out.println("
digest: " + sign + "
");
+
+ // spkacChallange
+ this.csr = "SPKAC=" + cleanedSPKAC;
+ this.csrType = CSRType.SPKAC;
+
+ } else {
+ login = "1".equals(req.getParameter("login"));
+ String hashAlg = req.getParameter("hash_alg");
+ if (hashAlg != null) {
+ selectedDigest = Digest.valueOf(hashAlg);
+ }
+ if (req.getParameter("CCA") == null) {
+ outputError(out, req, "You need to accept the CCA.");
+ return false;
+ }
+ System.out.println("issuing " + selectedDigest);
+ result = new Certificate(LoginPage.getUser(req).getId(), "/commonName=CAcert WoT User", selectedDigest.toString(), this.csr, this.csrType);
result.issue().waitFor(60000);
return true;
- } catch (SQLException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
- e.printStackTrace();
}
- return false;
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (IllegalArgumentException e) {
+ throw new GigiApiException("Certificate Request format is invalid.");
+ } catch (GeneralSecurityException e) {
+ throw new GigiApiException("Certificate Request format is invalid.");
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ } catch (SQLException e) {
+ throw new GigiApiException(e);
}
- } catch (IOException e) {
- e.printStackTrace();
- } catch (GeneralSecurityException e) {
- e.printStackTrace();
+ } catch (GigiApiException e) {
+ e.format(out, Page.getLanguage(req));
}
return false;
}
- private PKCS10 parseCSR(String csr) throws IOException, GeneralSecurityException {
- csr = csr.replaceFirst("-----BEGIN (NEW )?CERTIFICATE REQUEST-----", "");
- csr = csr.replaceFirst("-----END (NEW )?CERTIFICATE REQUEST-----", "");
- csr = csr.replace("\r", "");
- csr = csr.replace("\n", "");
- byte[] b = Base64.getDecoder().decode(csr);
- // Also checks signature validity
- return new PKCS10(b);
+ private void checkKeyStrength(PublicKey pk, PrintWriter out) {
+ out.println("Type: " + pk.getAlgorithm() + "
");
+ if (pk instanceof RSAPublicKey) {
+ out.println("Exponent: " + ((RSAPublicKey) pk).getPublicExponent() + "
");
+ out.println("Length: " + ((RSAPublicKey) pk).getModulus().bitLength());
+ } else if (pk instanceof DSAPublicKey) {
+ DSAPublicKey dpk = (DSAPublicKey) pk;
+ out.println("Length: " + dpk.getY().bitLength() + "
");
+ out.println(dpk.getParams());
+ } else if (pk instanceof ECPublicKey) {
+ ECPublicKey epk = (ECPublicKey) pk;
+ out.println("Length-x: " + epk.getW().getAffineX().bitLength() + "
");
+ out.println("Length-y: " + epk.getW().getAffineY().bitLength() + "
");
+ out.println(epk.getParams().getCurve());
+ }
+ }
+
+ private static PKCS10 parseCSR(String csr) throws IOException, GeneralSecurityException {
+ return new PKCS10(PEM.decode("(NEW )?CERTIFICATE REQUEST", csr));
+ }
+
+ private static String getSignatureAlgorithm(byte[] data) throws IOException {
+ DerInputStream in = new DerInputStream(data);
+ DerValue[] seq = in.getSequence(3);
+ return AlgorithmId.parse(seq[1]).getName();
+ }
+
+ @Override
+ public void output(PrintWriter out, Language l, Map vars) {
+ if (csr == null) {
+ HashMap vars2 = new HashMap(vars);
+ vars2.put("csrf", getCSRFToken());
+ vars2.put("csrf_name", getCsrfFieldName());
+ vars2.put("spkacChallange", spkacChallange);
+ tIni.output(out, l, vars2);
+ return;
+ } else {
+ super.output(out, l, vars);
+ }
}
@Override
@@ -152,5 +202,4 @@ public class IssueCertificateForm extends Form {
vars2.put("hashs", new HashAlgorithms(selectedDigest));
t.output(out, l, vars2);
}
-
}