Fix test for csrf.

[gigi.git] / src / org / cacert / gigi / pages / main / RegisterPage.java

diff --git a/src/org/cacert/gigi/pages/main/RegisterPage.java b/src/org/cacert/gigi/pages/main/RegisterPage.java
index 38c699741bb8ffb9090b8ad28592057b37c0a08b..e243c2875f92e826ac4ed21acb5adbaabed894b7 100644 (file)
--- a/src/org/cacert/gigi/pages/main/RegisterPage.java
+++ b/src/org/cacert/gigi/pages/main/RegisterPage.java
@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.cacert.gigi.output.Form;
 import org.cacert.gigi.pages.Page;
 
 public class RegisterPage extends Page {
@@ -21,28 +22,23 @@ public class RegisterPage extends Page {
 
        @Override
        public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+               Signup s = new Signup(req);
+               outputGet(req, resp, s);
+       }
+
+       private void outputGet(HttpServletRequest req, HttpServletResponse resp, Signup s) throws IOException {
                PrintWriter out = resp.getWriter();
                HashMap<String, Object> vars = new HashMap<String, Object>();
                getDefaultTemplate().output(out, getLanguage(req), vars);
-               Signup s = getForm(req);
                s.output(out, getLanguage(req), vars);
        }
 
-       public Signup getForm(HttpServletRequest req) {
-               HttpSession hs = req.getSession();
-               Signup s = (Signup) hs.getAttribute(SIGNUP_PROCESS);
-               if (s == null) {
-                       s = new Signup();
-                       hs.setAttribute(SIGNUP_PROCESS, s);
-               }
-               return s;
-
-       }
-
        @Override
        public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-               Signup s = getForm(req);
-               if (s.submit(resp.getWriter(), req)) {
+               Signup s = Form.getForm(req, Signup.class);
+               if (s == null) {
+                       resp.getWriter().println(translate(req, "CSRF token check failed."));
+               } else if (s.submit(resp.getWriter(), req)) {
                        HttpSession hs = req.getSession();
                        hs.setAttribute(SIGNUP_PROCESS, null);
                        resp.getWriter().println(
@@ -53,7 +49,7 @@ public class RegisterPage extends Page {
                        return;
                }
 
-               super.doPost(req, resp);
+               outputGet(req, resp, s);
        }
 
        @Override