X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=util-testing%2Forg%2Fcacert%2Fgigi%2FDevelLauncher.java;h=736947d55ac566675d62c25b93d06fa2120058ff;hb=40ac8e40f03b0ae8db51ba89ea476de114bdde41;hp=c32b6b30a6c83240735857e2283007119124466b;hpb=ab77de9b22988a2cedc35408769b9042073056f5;p=gigi.git diff --git a/util-testing/org/cacert/gigi/DevelLauncher.java b/util-testing/org/cacert/gigi/DevelLauncher.java index c32b6b30..736947d5 100644 --- a/util-testing/org/cacert/gigi/DevelLauncher.java +++ b/util-testing/org/cacert/gigi/DevelLauncher.java @@ -31,7 +31,11 @@ import org.cacert.gigi.dbObjects.ObjectCache; import org.cacert.gigi.dbObjects.User; import org.cacert.gigi.localisation.Language; import org.cacert.gigi.output.template.Template; +import org.cacert.gigi.output.template.TranslateCommand; +import org.cacert.gigi.pages.LoginPage; import org.cacert.gigi.pages.Page; +import org.cacert.gigi.pages.account.certs.CertificateRequest; +import org.cacert.gigi.pages.main.RegisterPage; import org.cacert.gigi.util.AuthorizationContext; import org.cacert.gigi.util.ServerConstants; import org.kamranzafar.jtar.TarEntry; @@ -118,14 +122,21 @@ public class DevelLauncher { // Check if we got a proper map (as much as we can tell) Object pagesObj = pageF.get(gigi); + if ( !(pagesObj instanceof Map)) { + throw new Error("Invalid state when initializing page structure"); + } + @SuppressWarnings("unchecked") - HashMap pages = pagesObj instanceof Map ? new HashMap<>((Map) pagesObj) : null; + HashMap pages = new HashMap<>((Map) pagesObj); pages.put("/manage", new Page("Page-manager") { @Override public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { ObjectCache.clearAllCaches(); + RegisterPage.RATE_LIMIT.bypass(); + LoginPage.RATE_LIMIT.bypass(); + CertificateRequest.RATE_LIMIT.bypass(); resp.getWriter().println("All caches cleared."); System.out.println("Caches cleared."); @@ -174,7 +185,7 @@ public class DevelLauncher { private static void addTicketPage(HashMap pages) { pages.put("/ticketWait", new Page("ticket") { - Template t = new Template(DevelLauncher.class.getResource("DevelTicketWait.templ")); + private final Template t = new Template(DevelLauncher.class.getResource("DevelTicketWait.templ")); @Override public boolean needsLogin() { @@ -204,7 +215,7 @@ public class DevelLauncher { sess.setAttribute(LOGGEDIN, true); sess.setAttribute(Language.SESSION_ATTRIB_NAME, user.getPreferredLocale()); sess.setAttribute(AUTH_CONTEXT, new AuthorizationContext(user, user)); - req.getSession().setAttribute(LOGIN_METHOD, "Ticket"); + req.getSession().setAttribute(LOGIN_METHOD, new TranslateCommand("Ticket")); resp.getWriter().println("ticket consumed"); ticketUsed = true; }