From 4c8152cd0aaa5876af3f9aa9c35835f5cdd2fe37 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sun, 14 Aug 2016 10:17:56 +0200 Subject: [PATCH] upd: use "submitProtected" more where applicable. Change-Id: Id22af91553ba26eae1a187d8ce73e1ce9f254713 --- src/org/cacert/gigi/pages/OneFormPage.java | 11 +++-------- src/org/cacert/gigi/pages/PasswordResetPage.java | 6 +----- src/org/cacert/gigi/pages/Verify.java | 6 +----- src/org/cacert/gigi/pages/admin/TTPAdminPage.java | 8 ++------ .../pages/admin/support/FindUserByEmailPage.java | 7 +------ src/org/cacert/gigi/pages/orga/CreateOrgPage.java | 12 +++--------- src/org/cacert/gigi/pages/wot/AssurePage.java | 12 +++--------- src/org/cacert/gigi/pages/wot/RequestTTPPage.java | 7 +------ 8 files changed, 15 insertions(+), 54 deletions(-) diff --git a/src/org/cacert/gigi/pages/OneFormPage.java b/src/org/cacert/gigi/pages/OneFormPage.java index c1e075cb..cfcc1983 100644 --- a/src/org/cacert/gigi/pages/OneFormPage.java +++ b/src/org/cacert/gigi/pages/OneFormPage.java @@ -20,14 +20,9 @@ public abstract class OneFormPage extends Page { @Override public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { - try { - Form form = Form.getForm(req, c); - if (form.submit(resp.getWriter(), req)) { - resp.sendRedirect(getSuccessPath(form)); - } - } catch (GigiApiException e) { - e.format(resp.getWriter(), getLanguage(req)); - doGet(req, resp); + Form form = Form.getForm(req, c); + if (form.submitProtected(resp.getWriter(), req)) { + resp.sendRedirect(getSuccessPath(form)); } } diff --git a/src/org/cacert/gigi/pages/PasswordResetPage.java b/src/org/cacert/gigi/pages/PasswordResetPage.java index 45abb59c..6c1b24ec 100644 --- a/src/org/cacert/gigi/pages/PasswordResetPage.java +++ b/src/org/cacert/gigi/pages/PasswordResetPage.java @@ -88,14 +88,10 @@ public class PasswordResetPage extends Page { @Override public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { PasswordResetForm form = Form.getForm(req, PasswordResetForm.class); - try { - form.submit(resp.getWriter(), req); + if (form.submitProtected(resp.getWriter(), req)) { resp.getWriter().println(getLanguage(req).getTranslation("Password reset successful.")); return; - } catch (GigiApiException e) { - e.format(resp.getWriter(), getLanguage(req)); } - form.output(resp.getWriter(), getLanguage(req), new HashMap()); } @Override diff --git a/src/org/cacert/gigi/pages/Verify.java b/src/org/cacert/gigi/pages/Verify.java index 0f88fe40..2a5950e9 100644 --- a/src/org/cacert/gigi/pages/Verify.java +++ b/src/org/cacert/gigi/pages/Verify.java @@ -101,11 +101,7 @@ public class Verify extends Page { @Override 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)); + if (Form.getForm(req, VerificationForm.class).submitProtected(resp.getWriter(), req)) { } } diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminPage.java b/src/org/cacert/gigi/pages/admin/TTPAdminPage.java index 2ffd12e2..8d9e4717 100644 --- a/src/org/cacert/gigi/pages/admin/TTPAdminPage.java +++ b/src/org/cacert/gigi/pages/admin/TTPAdminPage.java @@ -8,7 +8,6 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.GigiApiException; import org.cacert.gigi.dbObjects.Group; import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.localisation.Language; @@ -31,12 +30,9 @@ public class TTPAdminPage extends Page { @Override public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { - try { - Form.getForm(req, TTPAdminForm.class).submit(resp.getWriter(), req); - } catch (GigiApiException e) { - e.format(resp.getWriter(), getLanguage(req)); + if (Form.getForm(req, TTPAdminForm.class).submitProtected(resp.getWriter(), req)) { + resp.sendRedirect(PATH); } - resp.sendRedirect(PATH); } private static final int PAGE_LEN = 30; diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailPage.java b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailPage.java index ace7888a..15e6933e 100644 --- a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailPage.java +++ b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailPage.java @@ -7,7 +7,6 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.GigiApiException; import org.cacert.gigi.dbObjects.EmailAddress; import org.cacert.gigi.localisation.Language; import org.cacert.gigi.output.template.Form; @@ -34,8 +33,7 @@ public class FindUserByEmailPage extends Page { @Override public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { FindUserByEmailForm form = Form.getForm(req, FindUserByEmailForm.class); - try { - form.submit(resp.getWriter(), req); + if (form.submitProtected(resp.getWriter(), req)) { final EmailAddress[] emails = form.getEmails(); if (emails.length == 1) { resp.sendRedirect(SupportUserDetailsPage.PATH + emails[0].getOwner().getId() + "/"); @@ -58,9 +56,6 @@ public class FindUserByEmailPage extends Page { }); USERTABLE.output(resp.getWriter(), getLanguage(req), vars); } - } catch (GigiApiException e) { - e.format(resp.getWriter(), Page.getLanguage(req)); - form.output(resp.getWriter(), Page.getLanguage(req), new HashMap()); } } diff --git a/src/org/cacert/gigi/pages/orga/CreateOrgPage.java b/src/org/cacert/gigi/pages/orga/CreateOrgPage.java index eaf8ad28..3219fc01 100644 --- a/src/org/cacert/gigi/pages/orga/CreateOrgPage.java +++ b/src/org/cacert/gigi/pages/orga/CreateOrgPage.java @@ -6,7 +6,6 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.GigiApiException; import org.cacert.gigi.dbObjects.Group; import org.cacert.gigi.output.template.Form; import org.cacert.gigi.pages.Page; @@ -30,15 +29,10 @@ public class CreateOrgPage extends Page { @Override public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { CreateOrgForm form = Form.getForm(req, CreateOrgForm.class); - try { - if (form.submit(resp.getWriter(), req)) { - resp.sendRedirect(ViewOrgPage.DEFAULT_PATH + "/" + form.getResult().getId()); - return; - } - } catch (GigiApiException e) { - e.format(resp.getWriter(), getLanguage(req)); + if (form.submitProtected(resp.getWriter(), req)) { + resp.sendRedirect(ViewOrgPage.DEFAULT_PATH + "/" + form.getResult().getId()); + return; } - form.output(resp.getWriter(), getLanguage(req), new HashMap()); } @Override diff --git a/src/org/cacert/gigi/pages/wot/AssurePage.java b/src/org/cacert/gigi/pages/wot/AssurePage.java index 508a9c62..95ab35f0 100644 --- a/src/org/cacert/gigi/pages/wot/AssurePage.java +++ b/src/org/cacert/gigi/pages/wot/AssurePage.java @@ -49,16 +49,10 @@ public class AssurePage extends Page { PrintWriter out = resp.getWriter(); if (req.getParameter("search") == null) { AssuranceForm form = Form.getForm(req, AssuranceForm.class); - try { - if (form.submit(out, req)) { - out.println(translate(req, "Verification complete.")); - return; - } - } catch (GigiApiException e) { - e.format(out, Page.getLanguage(req)); - form.output(out, getLanguage(req), new HashMap()); + if (form.submitProtected(out, req)) { + out.println(translate(req, "Verification complete.")); + return; } - return; } diff --git a/src/org/cacert/gigi/pages/wot/RequestTTPPage.java b/src/org/cacert/gigi/pages/wot/RequestTTPPage.java index c97c98bb..7e50059d 100644 --- a/src/org/cacert/gigi/pages/wot/RequestTTPPage.java +++ b/src/org/cacert/gigi/pages/wot/RequestTTPPage.java @@ -6,7 +6,6 @@ import java.util.HashMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.cacert.gigi.GigiApiException; import org.cacert.gigi.dbObjects.Assurance; import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.output.template.Form; @@ -24,11 +23,7 @@ public class RequestTTPPage extends Page { @Override public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { - try { - Form.getForm(req, RequestTTPForm.class).submit(resp.getWriter(), req); - } catch (GigiApiException e) { - e.format(resp.getWriter(), getLanguage(req)); - } + Form.getForm(req, RequestTTPForm.class).submitProtected(resp.getWriter(), req); } @Override -- 2.39.2