import org.cacert.gigi.GigiApiException;
import org.cacert.gigi.dbObjects.Certificate;
+import org.cacert.gigi.dbObjects.Certificate.CertificateStatus;
import org.cacert.gigi.dbObjects.Certificate.SubjectAlternateName;
import org.cacert.gigi.dbObjects.CertificateProfile;
+import org.cacert.gigi.dbObjects.Domain;
import org.cacert.gigi.dbObjects.Organisation;
+import org.cacert.gigi.dbObjects.User;
import org.cacert.gigi.localisation.Language;
import org.cacert.gigi.output.CertificateValiditySelector;
import org.cacert.gigi.output.HashAlgorithms;
import org.cacert.gigi.output.template.Form;
import org.cacert.gigi.output.template.IterableDataset;
+import org.cacert.gigi.output.template.Outputable;
import org.cacert.gigi.output.template.Template;
import org.cacert.gigi.pages.LoginPage;
import org.cacert.gigi.util.AuthorizationContext;
+import org.cacert.gigi.util.HTMLEncoder;
import org.cacert.gigi.util.RandomToken;
+import org.cacert.gigi.util.ServerConstants;
/**
* This class represents a form that is used for issuing certificates. This
CertificateValiditySelector issueDate = new CertificateValiditySelector();
@Override
- public boolean submit(HttpServletRequest req) throws GigiApiException {
+ public SubmissionResult submit(HttpServletRequest req) throws GigiApiException {
String csr = req.getParameter("CSR");
String spkac = req.getParameter("SPKAC");
try {
if (csr != null) {
cr = new CertificateRequest(c, csr);
// TODO cr.checkKeyStrength(out);
- return false;
+ return new FormContinue();
} else if (spkac != null) {
cr = new CertificateRequest(c, spkac, spkacChallenge);
// TODO cr.checkKeyStrength(out);
- return false;
+ return new FormContinue();
} else if (cr != null) {
login = "1".equals(req.getParameter("login"));
issueDate.update(req);
}
result.issue(issueDate.getFrom(), issueDate.getTo(), c.getActor()).waitFor(60000);
this.result = result;
- return true;
+ Certificate c = result;
+ if (c.getStatus() != CertificateStatus.ISSUED) {
+ throw new PermamentFormException(new GigiApiException("Timeout while waiting for certificate."));
+ }
+ String ser = c.getSerial();
+ if (ser.isEmpty()) {
+ throw new PermamentFormException(new GigiApiException("Timeout while waiting for certificate."));
+ }
+ return new RedirectResult(Certificates.PATH + "/" + ser);
} else {
throw new GigiApiException("Error no action.");
}
content.append(SAN.getName());
content.append('\n');
}
-
+ vars2.put("placeholderName", CertificateRequest.DEFAULT_CN);
+ if (c.getTarget() instanceof User) {
+ User target = (User) c.getTarget();
+ vars2.put("defaultName", target.getPreferredName().toString());
+ vars2.put("defaultEmail", target.getEmail());
+ Domain[] domains = target.getDomains();
+ if (domains.length > 0) {
+ vars2.put("defaultDomain", domains[0].getSuffix());
+ }
+ }
vars2.put("CN", cr.getName());
if (c.getTarget() instanceof Organisation) {
vars2.put("orga", "true");
vars2.put("department", cr.getOu());
}
+ vars2.put("secureHostname", new Outputable() {
+
+ @Override
+ public void output(PrintWriter out, Language l, Map<String, Object> vars) {
+ out.print("<code>");
+ out.print(HTMLEncoder.encodeHTML("https://" + ServerConstants.getSecureHostNamePortSecure()));
+ out.print("</code>");
+ }
+ });
vars2.put("validity", issueDate);
vars2.put("emails", content.toString());
vars2.put("hashs", new HashAlgorithms(cr.getSelectedDigest()));