Merge "Update notes about password security"

[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 b38194994bb69044907a3f3910feaae618482311..1e6b33783ee3b89c47c3e602cb90b0196bb949a8 100644 (file)
--- a/src/org/cacert/gigi/pages/main/RegisterPage.java
+++ b/src/org/cacert/gigi/pages/main/RegisterPage.java
@@ -8,58 +8,59 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.util.AuthorizationContext;
+import org.cacert.gigi.util.RateLimit;
 
 public class RegisterPage extends Page {
 
-       private static final String SIGNUP_PROCESS = "signupProcess";
-       public static final String PATH = "/register";
+    private static final String SIGNUP_PROCESS = "signupProcess";
 
-       public RegisterPage() {
-               super("Register");
-       }
+    public static final String PATH = "/register";
 
-       @Override
-       public void doGet(HttpServletRequest req, HttpServletResponse resp)
-                       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;
+    // 50 per 5 min
+    public static final RateLimit RATE_LIMIT = new RateLimit(50, 5 * 60 * 1000);
 
-       }
-       @Override
-       public void doPost(HttpServletRequest req, HttpServletResponse resp)
-                       throws IOException {
-               Signup s = getForm(req);
-               if (s.submit(resp.getWriter(), req)) {
-                       HttpSession hs = req.getSession();
-                       hs.setAttribute(SIGNUP_PROCESS, null);
-                       resp.getWriter()
-                                       .println(
-                                                       translate(
-                                                                       req,
-                                                                       "Your information has been submitted"
-                                                                                       + " into our system. You will now be sent an email with a web link,"
-                                                                                       + " you need to open that link in your web browser within 24 hours"
-                                                                                       + " or your information will be removed from our system!"));
-                       return;
-               }
+    public RegisterPage() {
+        super("Register");
+    }
 
-               super.doPost(req, resp);
-       }
-       @Override
-       public boolean needsLogin() {
-               return false;
-       }
+    @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);
+        s.output(out, getLanguage(req), vars);
+    }
+
+    @Override
+    public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        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(translate(req, "Your information has been submitted" + " into our system. You will now be sent an email with a web link," + " you need to open that link in your web browser within 24 hours" + " or your information will be removed from our system!"));
+            return;
+        }
+
+        outputGet(req, resp, s);
+    }
+
+    @Override
+    public boolean needsLogin() {
+        return false;
+    }
+
+    @Override
+    public boolean isPermitted(AuthorizationContext ac) {
+        return ac == null;
+    }
 }