]> WPIA git - gigi.git/blobdiff - src/org/cacert/gigi/pages/wot/AssurePage.java
Correct csrf-token impl.
[gigi.git] / src / org / cacert / gigi / pages / wot / AssurePage.java
index 015029601bbaeab65177fe572d1b890141bf3632..9c29044bbf2b0a18053b76ed0edcce280cfd73c2 100644 (file)
@@ -10,96 +10,89 @@ import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
 import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.output.DateSelector;
+import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.Template;
-import org.cacert.gigi.output.Form.CSRFError;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.Notary;
+import org.cacert.gigi.util.Notary.AssuranceResult;
 
 public class AssurePage extends Page {
        public static final String PATH = "/wot/assure";
-       public static final String SESSION = "/wot/assure/FORM";
        DateSelector ds = new DateSelector("day", "month", "year");
        Template t;
 
        public AssurePage() {
                super("Assure someone");
-               t = new Template(new InputStreamReader(
-                               AssuranceForm.class.getResourceAsStream("AssureeSearch.templ")));
+               t = new Template(new InputStreamReader(AssuranceForm.class.getResourceAsStream("AssureeSearch.templ")));
 
        }
 
        @Override
-       public void doGet(HttpServletRequest req, HttpServletResponse resp)
-                       throws IOException {
+       public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
 
                PrintWriter out = resp.getWriter();
                String pi = req.getPathInfo().substring(PATH.length());
                if (pi.length() > 1) {
-                       User myself = LoginPage.getUser(req);
                        int mid = Integer.parseInt(pi.substring(1));
+                       AssuranceForm form = new AssuranceForm(req, mid);
+                       outputForm(req, out, mid, form);
 
-                       if (!Notary.checkAssuranceIsPossible(myself, new User(mid), out)) {
-                               return;
-                       }
-                       HttpSession hs = req.getSession();
-                       AssuranceForm form = (AssuranceForm) hs.getAttribute(SESSION);
-                       if (form == null || form.assuree.getId() != mid) {
-                               form = new AssuranceForm(mid);
-                               hs.setAttribute(SESSION, form);
-                       }
-
-                       form.output(out, getLanguage(req), new HashMap<String, Object>());;
                } else {
                        HashMap<String, Object> vars = new HashMap<String, Object>();
                        vars.put("DoB", ds);
                        t.output(out, getLanguage(req), vars);
                }
        }
+
+       private void outputForm(HttpServletRequest req, PrintWriter out, int mid, AssuranceForm form) {
+               User myself = LoginPage.getUser(req);
+               AssuranceResult check = Notary.checkAssuranceIsPossible(myself, new User(mid));
+               if (check != AssuranceResult.ASSURANCE_SUCCEDED) {
+                       out.println(translate(req, check.getMessage()));
+                       return;
+               }
+               if (form == null || form.assuree.getId() != mid) {
+                       form = new AssuranceForm(req, mid);
+               }
+
+               form.output(out, getLanguage(req), new HashMap<String, Object>());
+       }
+
        @Override
-       public void doPost(HttpServletRequest req, HttpServletResponse resp)
-                       throws IOException {
+       public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
                PrintWriter out = resp.getWriter();
                String pi = req.getPathInfo().substring(PATH.length());
                if (pi.length() > 1) {
                        User myself = LoginPage.getUser(req);
                        int mid = Integer.parseInt(pi.substring(1));
                        if (mid == myself.getId()) {
-                               out.println("Cannot assure myself.");
+                               out.println(translate(req, "Cannot assure myself."));
                                return;
                        }
 
-                       AssuranceForm form = (AssuranceForm) req.getSession().getAttribute(
-                                       SESSION);
-                       if (form == null) {
-                               out.println("No form found. This is an Error. Fill in the form again.");
+                       AssuranceForm form = Form.getForm(req, AssuranceForm.class);
+                       if (mid != form.assuree.getId()) {
                                return;
                        }
-                       try {
-                               form.submit(out, req);
-                       } catch (CSRFError e) {
-                               resp.sendError(500, "CSRF Failed");
-                               out.println(translate(req, "CSRF Token failed."));
+                       if (form.submit(out, req)) {
+                               out.println(translate(req, "Assurance complete."));
+                       } else {
+                               outputForm(req, resp.getWriter(), mid, form);
                        }
 
                        return;
                }
 
-               System.out.println("searching for");
                ResultSet rs = null;
                try {
-                       PreparedStatement ps = DatabaseConnection
-                                       .getInstance()
-                                       .prepare(
-                                                       "SELECT id, verified FROM users WHERE email=? AND dob=? AND deleted=0");
+                       PreparedStatement ps = DatabaseConnection.getInstance().prepare(
+                               "SELECT id, verified FROM users WHERE email=? AND dob=? AND deleted=0");
                        ps.setString(1, req.getParameter("email"));
-                       String day = req.getParameter("year") + "-"
-                                       + req.getParameter("month") + "-" + req.getParameter("day");
+                       String day = req.getParameter("year") + "-" + req.getParameter("month") + "-" + req.getParameter("day");
                        ps.setString(2, day);
                        rs = ps.executeQuery();
                        int id = 0;
@@ -110,19 +103,15 @@ public class AssurePage extends Page {
                                        out.println("Error, ambigous user. Please contact support@cacert.org.");
                                } else {
                                        if (verified == 0) {
-                                               out.println(translate(req,
-                                                               "User is not yet verified. Please try again in 24 hours!"));
+                                               out.println(translate(req, "User is not yet verified. Please try again in 24 hours!"));
                                        }
                                        resp.sendRedirect(PATH + "/" + id);
                                }
                        } else {
                                out.print("<div class='formError'>");
 
-                               out.println(translate(
-                                               req,
-                                               "I'm sorry, there was no email and date of birth matching"
-                                                               + " what you entered in the system. Please double check"
-                                                               + " your information."));
+                               out.println(translate(req, "I'm sorry, there was no email and date of birth matching"
+                                       + " what you entered in the system. Please double check" + " your information."));
                                out.print("</div>");
                        }