package org.cacert.gigi.pages.account;
import java.io.IOException;
-import java.io.PrintWriter;
-import java.sql.SQLException;
+import java.util.Collections;
import java.util.HashMap;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.cacert.gigi.Certificate;
-import org.cacert.gigi.output.ClientCSRGenerate;
-import org.cacert.gigi.pages.LoginPage;
+import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Template;
import org.cacert.gigi.pages.Page;
public class MailCertificateAdd extends Page {
public static final String PATH = "/account/certs/email/new";
+ Template t = new Template(MailCertificateAdd.class.getResource("RequestCertificate.templ"));
public MailCertificateAdd() {
super("Create Email certificate");
public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
HashMap<String, Object> vars = new HashMap<String, Object>();
vars.put("CCA", "<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>");
- getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
+
+ t.output(resp.getWriter(), getLanguage(req), vars);
}
@Override
public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
- PrintWriter out = resp.getWriter();
- if (req.getParameter("optionalCSR") == null || req.getParameter("optionalCSR").equals("")) {
- out.println("csr missing");
- ClientCSRGenerate.output(req, resp);
- }
- String csr = req.getParameter("optionalCSR");
- if (!"on".equals(req.getParameter("CCA"))) {
- // Error.
- return;
- }
- Certificate c = new Certificate(LoginPage.getUser(req).getId(), "/commonName=CAcert WoT User", "sha256", csr);
- c.issue();
- try {
- c.waitFor(60000);
- resp.sendRedirect(MailCertificates.PATH + "/" + c.getSerial());
- } catch (SQLException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
- e.printStackTrace();
+ IssueCertificateForm f;
+ if (req.getParameter(Form.CSRF_FIELD) != null) {
+ f = Form.getForm(req, IssueCertificateForm.class);
+ if (f.submit(resp.getWriter(), req)) {
+ Certificate c = f.getResult();
+ String ser = c.getSerial();
+ resp.sendRedirect(MailCertificates.PATH + "/" + ser);
+ }
+ } else {
+ f = new IssueCertificateForm(req);
+ f.submit(resp.getWriter(), req);
}
+ f.output(resp.getWriter(), getLanguage(req), Collections.<String, Object> emptyMap());
}
-
}