ADD: Verify, only act on POST (+CSRF)

[gigi.git] / src / org / cacert / gigi / pages / Verify.java

diff --git a/src/org/cacert/gigi/pages/Verify.java b/src/org/cacert/gigi/pages/Verify.java
index 2ebd54c5f2d4447ae9fe5a8352a05c53229c8300..a1d613a744346984602f33444889fb086eec662b 100644 (file)
--- a/src/org/cacert/gigi/pages/Verify.java
+++ b/src/org/cacert/gigi/pages/Verify.java
@@ -2,6 +2,8 @@ package org.cacert.gigi.pages;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -9,9 +11,62 @@ import javax.servlet.http.HttpServletResponse;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Domain;
 import org.cacert.gigi.dbObjects.EmailAddress;
+import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.output.template.Form;
 
 public class Verify extends Page {
 
+    private class VerificationForm extends Form {
+
+        private String hash;
+
+        private String type;
+
+        private String id;
+
+        public VerificationForm(HttpServletRequest hsr) {
+            super(hsr, PATH);
+            hash = hsr.getParameter("hash");
+            type = hsr.getParameter("type");
+            id = hsr.getParameter("id");
+        }
+
+        @Override
+        public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException {
+            if ("email".equals(type)) {
+                try {
+                    EmailAddress ea = EmailAddress.getById(Integer.parseInt(id));
+                    ea.verify(hash);
+                    out.println("Email verification completed.");
+                } catch (IllegalArgumentException e) {
+                    out.println(translate(req, "The email address is invalid."));
+                } catch (GigiApiException e) {
+                    e.format(out, getLanguage(req));
+                }
+            } else if ("domain".equals(type)) {
+                try {
+                    Domain ea = Domain.getById(Integer.parseInt(id));
+                    ea.verify(hash);
+                    out.println("Domain verification completed.");
+                } catch (IllegalArgumentException e) {
+                    out.println(translate(req, "The domain address is invalid."));
+                } catch (GigiApiException e) {
+                    e.format(out, getLanguage(req));
+                }
+            }
+            return true;
+        }
+
+        @Override
+        protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
+            vars.put("hash", hash);
+            vars.put("id", id);
+            vars.put("type", type);
+            getDefaultTemplate().output(out, l, vars);
+        }
+
+    }
+
     public static final String PATH = "/verify";
 
     public Verify() {
@@ -24,32 +79,18 @@ public class Verify extends Page {
     }
 
     @Override
-    public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        PrintWriter out = resp.getWriter();
-        String hash = req.getParameter("hash");
-        String type = req.getParameter("type");
-        String id = req.getParameter("id");
-        if ("email".equals(type)) {
-            try {
-                EmailAddress ea = EmailAddress.getById(Integer.parseInt(id));
-                ea.verify(hash);
-                out.println("Email verification completed.");
-            } catch (IllegalArgumentException e) {
-                out.println(translate(req, "The email address is invalid."));
-            } catch (GigiApiException e) {
-                e.format(out, getLanguage(req));
-            }
-        } else if ("domain".equals(type)) {
-            try {
-                Domain ea = Domain.getById(Integer.parseInt(id));
-                ea.verify(hash);
-                out.println("Domain verification completed.");
-            } catch (IllegalArgumentException e) {
-                out.println(translate(req, "The domain address is invalid."));
-            } catch (GigiApiException e) {
-                e.format(out, getLanguage(req));
+    public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        try {
+            if (Form.getForm(req, VerificationForm.class).submit(resp.getWriter(), req)) {
             }
+        } catch (GigiApiException e) {
+            e.format(resp.getWriter(), getLanguage(req));
         }
     }
 
+    @Override
+    public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        new VerificationForm(req).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
+    }
+
 }