X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FMailCertificateAdd.java;h=c25db15f89cf18f426ed9703f682a2740d9b4d47;hb=09f0476b47711ec02bb96bdd2090ea1930f434a5;hp=836f48c4f13c1ff1e035ff5a9f7accb4d20ee1e8;hpb=22f27f39d5b62ca5b264b2016daae7e870f78fd8;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/account/MailCertificateAdd.java b/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
index 836f48c4..c25db15f 100644
--- a/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
+++ b/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
@@ -1,20 +1,19 @@
 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");
@@ -24,32 +23,25 @@ public class MailCertificateAdd extends Page {
 	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());
 
 	}
-
 }