Merge "Update notes about password security"

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

diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index 52a6603f76615e364229d105e85845a01c4eafdb..d341df280f237ed2417d406c47f5570431211b20 100644 (file)
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -9,7 +9,6 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.database.GigiResultSet;
 import org.cacert.gigi.dbObjects.Name;
@@ -20,6 +19,7 @@ import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.util.CalendarUtil;
 import org.cacert.gigi.util.HTMLEncoder;
 import org.cacert.gigi.util.Notary;
 import org.cacert.gigi.util.PasswordStrengthChecker;
@@ -56,6 +56,7 @@ public class Signup extends Form {
         vars.put("radius", radius ? " checked=\"checked\"" : "");
         vars.put("helpOnNames", String.format(l.getTranslation("Help on Names %sin the wiki%s"), "<a href=\"//wiki.cacert.org/FAQ/HowToEnterNamesInJoinForm\" target=\"_blank\">", "</a>"));
         vars.put("csrf", getCSRFToken());
+        vars.put("dobmin", User.MINIMUM_AGE + "");
         t.output(out, l, vars);
     }
 
@@ -92,6 +93,11 @@ public class Signup extends Form {
 
     @Override
     public synchronized boolean submit(PrintWriter out, HttpServletRequest req) {
+        if (RegisterPage.RATE_LIMIT.isLimitExceeded(req.getRemoteAddr())) {
+            outputError(out, req, "Rate Limit Exceeded");
+            return false;
+        }
+
         update(req);
         if (buildupName.getLname().trim().equals("")) {
             outputError(out, req, "Last name were blank.");
@@ -99,8 +105,13 @@ public class Signup extends Form {
         if ( !myDoB.isValid()) {
             outputError(out, req, "Invalid date of birth");
         }
-        if ( !"1".equals(req.getParameter("cca_agree"))) {
-            outputError(out, req, "You have to agree to the CAcert Community agreement.");
+
+        if ( !CalendarUtil.isOfAge(myDoB.getDate(), User.MINIMUM_AGE)) {
+            outputError(out, req, "Entered dated of birth is below the restricted age requirements.");
+        }
+
+        if ( !"1".equals(req.getParameter("tos_agree"))) {
+            outputError(out, req, "Acceptance of the ToS is required to continue.");
         }
         if (email.equals("")) {
             outputError(out, req, "Email Address was blank");
@@ -158,40 +169,29 @@ public class Signup extends Form {
         if (isFailed(out)) {
             return false;
         }
-        if (RegisterPage.RATE_LIMIT.isLimitExceeded(req.getRemoteAddr())) {
-            outputError(out, req, "Rate Limit Exceeded");
-            return false;
-        }
         try {
             run(req, pw1);
         } catch (SQLException e) {
             e.printStackTrace();
         } catch (GigiApiException e) {
-            outputError(out, req, e.getMessage());
+            e.format(out, Page.getLanguage(req));
             return false;
         }
         return true;
     }
 
     private void run(HttpServletRequest req, String password) throws SQLException, GigiApiException {
-        try {
-            DatabaseConnection.getInstance().beginTransaction();
-            User u = new User(email, password, buildupName, myDoB.getDate(), Page.getLanguage(req).getLocale());
-
-            try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `alerts` SET `memid`=?," + " `general`=?, `country`=?, `regional`=?, `radius`=?")) {
-                ps.setInt(1, u.getId());
-                ps.setBoolean(2, general);
-                ps.setBoolean(3, country);
-                ps.setBoolean(4, regional);
-                ps.setBoolean(5, radius);
-                ps.execute();
-            }
-            Notary.writeUserAgreement(u, "CCA", "account creation", "", true, 0);
+        User u = new User(email, password, buildupName, myDoB.getDate(), Page.getLanguage(req).getLocale());
 
-            DatabaseConnection.getInstance().commitTransaction();
-        } finally {
-            DatabaseConnection.getInstance().quitTransaction();
+        try (GigiPreparedStatement ps = new GigiPreparedStatement("INSERT INTO `alerts` SET `memid`=?," + " `general`=?, `country`=?, `regional`=?, `radius`=?")) {
+            ps.setInt(1, u.getId());
+            ps.setBoolean(2, general);
+            ps.setBoolean(3, country);
+            ps.setBoolean(4, regional);
+            ps.setBoolean(5, radius);
+            ps.execute();
         }
+        Notary.writeUserAgreement(u, "ToS", "account creation", "", true, 0);
 
     }
 }