X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FMailCertificateAdd.java;h=92b6a106d04ae91d5440f6ca622b2e4c1baba550;hb=b93a39014fe39b0b3527849acc0e57e5b7772f1b;hp=fe93959da6493118dd312c466e7441065ac43ec6;hpb=e9336bb2781a287a5542179208a869acd17c9a5a;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/account/MailCertificateAdd.java b/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
index fe93959d..92b6a106 100644
--- a/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
+++ b/src/org/cacert/gigi/pages/account/MailCertificateAdd.java
@@ -1,58 +1,84 @@
 package org.cacert.gigi.pages.account;
 
 import java.io.IOException;
-import java.io.PrintWriter;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.cacert.gigi.Language;
+import org.cacert.gigi.User;
+import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.output.template.IterableDataset;
+import org.cacert.gigi.pages.LoginPage;
 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);
-	}
-	@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("/commonName=CAcert WoT User",
-				"sha256", csr);
-		c.issue();
+		vars.put("CCA", "<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>");
+
+		User u = LoginPage.getUser(req);
 		try {
-			c.waitFor(60000);
-			resp.sendRedirect(MailCertificates.PATH + "/" + c.getId());
+			PreparedStatement ps = DatabaseConnection.getInstance().prepare(
+				"SELECT `id`,`email` from `email` WHERE `memid`=? AND `deleted`=0");
+			ps.setInt(1, u.getId());
+			final ResultSet rs = ps.executeQuery();
+			vars.put("emails", new IterableDataset() {
+
+				@Override
+				public boolean next(Language l, Map<String, Object> vars) {
+					try {
+						if (!rs.next()) {
+							return false;
+						}
+						vars.put("id", rs.getString(1));
+						vars.put("value", rs.getString(2));
+						return true;
+					} catch (SQLException e) {
+						e.printStackTrace();
+					}
+					return false;
+				}
+			});
+			getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
+			rs.close();
 		} catch (SQLException e) {
 			e.printStackTrace();
-		} catch (InterruptedException e) {
-			e.printStackTrace();
 		}
-
 	}
 
+	@Override
+	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);
+		}
+		f.output(resp.getWriter(), getLanguage(req), Collections.<String, Object> emptyMap());
+
+	}
 }