import org.cacert.gigi.User;
import org.cacert.gigi.crypto.SPKAC;
import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.output.CertificateValiditySelector;
import org.cacert.gigi.output.Form;
import org.cacert.gigi.output.template.HashAlgorithms;
import org.cacert.gigi.output.template.IterableDataset;
*/
public class CertificateIssueForm extends Form {
- private static final String DEFAULT_CN = "CAcert WoT User";
+ public static final String DEFAULT_CN = "CAcert WoT User";
private final static Template t = new Template(CertificateIssueForm.class.getResource("CertificateIssueForm.templ"));
1, 3, 6, 1, 5, 5, 7, 3, 9
});
- User u;
+ private User u;
private CSRType csrType;
- String csr;
+ private String csr;
- String spkacChallenge;
+ private String spkacChallenge;
public String CN = DEFAULT_CN;
- Set<SubjectAlternateName> SANs = new LinkedHashSet<>();
+ private Set<SubjectAlternateName> SANs = new LinkedHashSet<>();
- Digest selectedDigest = Digest.getDefault();
+ private Digest selectedDigest = Digest.getDefault();
- boolean login;
+ CertificateValiditySelector issueDate = new CertificateValiditySelector();
- CertificateProfile profile = CertificateProfile.getById(1);
+ private boolean login;
+
+ private CertificateProfile profile = CertificateProfile.getById(1);
public CertificateIssueForm(HttpServletRequest hsr) {
super(hsr);
spkacChallenge = RandomToken.generateToken(16);
}
- Certificate result;
+ private Certificate result;
public Certificate getResult() {
return result;
PublicKey pk = parsed.getSubjectPublicKeyInfo();
checkKeyStrength(pk, out);
String sign = getSignatureAlgorithm(data);
+ guessDigest(sign);
+
out.println("<br/>digest: " + sign + "<br/>");
this.csr = csr;
}
checkKeyStrength(parsed.getPubkey(), out);
String sign = getSignatureAlgorithm(data);
+ guessDigest(sign);
out.println("<br/>digest: " + sign + "<br/>");
// spkacChallenge
} else {
login = "1".equals(req.getParameter("login"));
+ issueDate.update(req);
CN = req.getParameter("CN");
String hashAlg = req.getParameter("hash_alg");
if (hashAlg != null) {
result = new Certificate(LoginPage.getUser(req).getId(), subject.toString(), selectedDigest.toString(), //
this.csr, this.csrType, profile, SANs.toArray(new SubjectAlternateName[SANs.size()]));
- result.issue().waitFor(60000);
+ result.issue(issueDate.getFrom(), issueDate.getTo()).waitFor(60000);
return true;
}
} catch (IOException e) {
return false;
}
+ private void guessDigest(String sign) {
+ if (sign.toLowerCase().startsWith("sha512")) {
+ selectedDigest = Digest.SHA512;
+ } else if (sign.toLowerCase().startsWith("sha384")) {
+ selectedDigest = Digest.SHA384;
+ }
+ }
+
private TreeSet<SubjectAlternateName> parseSANBox(String SANs) {
String[] SANparts = SANs.split("[\r\n]+|, *");
TreeSet<SubjectAlternateName> parsedNames = new TreeSet<>();
}
vars2.put("CN", CN);
+ vars2.put("validity", issueDate);
vars2.put("emails", content.toString());
vars2.put("hashs", new HashAlgorithms(selectedDigest));
vars2.put("profiles", new IterableDataset() {