X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FMailCertificateAdd.java;h=c25db15f89cf18f426ed9703f682a2740d9b4d47;hb=ed26a914878caf7fc51262a759d21f9313943cfa;hp=97038898e8e704619dead0ded5b15f57eee6f66b;hpb=ab88602bac4ff5c5540765a85a2013ecadb070df;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/account/MailCertificateAdd.java b/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
index 97038898..c25db15f 100644
--- a/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
+++ b/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
@@ -1,61 +1,47 @@
 package org.cacert.gigi.pages.account;
 
 import java.io.IOException;
-import java.io.PrintWriter;
-import java.security.GeneralSecurityException;
-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.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");
 	}
 
 	@Override
-	public void doGet(HttpServletRequest req, HttpServletResponse resp)
-			throws IOException {
+	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);
+		vars.put("CCA", "<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>");
+
+		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;
+	public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+		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);
 		}
-		Certificate c = new Certificate("/commonName=felix@dogcraft.de",
-				"sha256", csr);
-		c.issue();
-		try {
-			c.waitFor(60000);
-			out.println(c.getStatus());
-			out.println(c.cert());
-		} catch (SQLException e1) {
-			e1.printStackTrace();
-		} catch (GeneralSecurityException e) {
-			e.printStackTrace();
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
+		f.output(resp.getWriter(), getLanguage(req), Collections.<String, Object> emptyMap());
 
+	}
 }