X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpage%2FTemplatePage.java;h=e6ee539c5935b6c5c138731e8a812d6ca4d09e8a;hb=0a135cf48d060e43377c6cc56a73addf092ef536;hp=79dd20863d042a9c0a867c9f3617ceed4d3d98ec;hpb=65d624e0c8478358e859abd1d7e609e49aff2a28;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/web/page/TemplatePage.java b/src/main/java/net/pterodactylus/sone/web/page/TemplatePage.java index 79dd208..e6ee539 100644 --- a/src/main/java/net/pterodactylus/sone/web/page/TemplatePage.java +++ b/src/main/java/net/pterodactylus/sone/web/page/TemplatePage.java @@ -20,7 +20,12 @@ package net.pterodactylus.sone.web.page; import java.io.StringWriter; import java.util.Collection; import java.util.Collections; +import java.util.logging.Level; +import java.util.logging.Logger; +import net.pterodactylus.sone.web.page.Page.Request.Method; +import net.pterodactylus.util.logging.Logging; +import net.pterodactylus.util.template.DataProvider; import net.pterodactylus.util.template.Template; import freenet.clients.http.LinkEnabledCallback; import freenet.clients.http.PageMaker; @@ -35,11 +40,14 @@ import freenet.l10n.BaseL10n; */ public class TemplatePage implements Page, LinkEnabledCallback { + /** The logger. */ + private static final Logger logger = Logging.getLogger(TemplatePage.class); + /** The path of the page. */ private final String path; /** The template to render. */ - protected final Template template; + private final Template template; /** The L10n handler. */ private final BaseL10n l10n; @@ -47,6 +55,9 @@ public class TemplatePage implements Page, LinkEnabledCallback { /** The l10n key for the page title. */ private final String pageTitleKey; + /** Where to redirect for invalid form passwords. */ + private final String invalidFormPasswordRedirectTarget; + /** * Creates a new template page. * @@ -58,12 +69,16 @@ public class TemplatePage implements Page, LinkEnabledCallback { * The L10n handler * @param pageTitleKey * The l10n key of the title page + * @param invalidFormPasswordRedirectTarget + * The target to redirect to if a POST request does not contain + * the correct form password */ - public TemplatePage(String path, Template template, BaseL10n l10n, String pageTitleKey) { + public TemplatePage(String path, Template template, BaseL10n l10n, String pageTitleKey, String invalidFormPasswordRedirectTarget) { this.path = path; this.template = template; this.l10n = l10n; this.pageTitleKey = pageTitleKey; + this.invalidFormPasswordRedirectTarget = invalidFormPasswordRedirectTarget; } /** @@ -85,6 +100,13 @@ public class TemplatePage implements Page, LinkEnabledCallback { } ToadletContext toadletContext = request.getToadletContext(); + if (request.getMethod() == Method.POST) { + /* require form password. */ + String formPassword = request.getHttpRequest().getPartAsStringFailsafe("formPassword", 32); + if (!formPassword.equals(toadletContext.getContainer().getFormPassword())) { + return new RedirectResponse(invalidFormPasswordRedirectTarget); + } + } PageMaker pageMaker = toadletContext.getPageMaker(); PageNode pageNode = pageMaker.getPageNode(l10n.getString(pageTitleKey), toadletContext); for (String styleSheet : getStyleSheets()) { @@ -95,16 +117,22 @@ public class TemplatePage implements Page, LinkEnabledCallback { pageNode.addForwardLink("icon", shortcutIcon); } + DataProvider dataProvider = template.createDataProvider(); try { - processTemplate(request, template); + long start = System.nanoTime(); + processTemplate(request, dataProvider); + long finish = System.nanoTime(); + logger.log(Level.FINEST, "Template was rendered in " + ((finish - start) / 1000) / 1000.0 + "ms."); } catch (RedirectException re1) { return new RedirectResponse(re1.getTarget()); } StringWriter stringWriter = new StringWriter(); - template.render(stringWriter); + template.render(dataProvider, stringWriter); pageNode.content.addChild("%", stringWriter.toString()); + postProcess(request, dataProvider); + return new Response(200, "OK", "text/html", pageNode.outer.generate()); } @@ -133,12 +161,29 @@ public class TemplatePage implements Page, LinkEnabledCallback { * * @param request * The request that is rendered - * @param template - * The template to set variables in + * @param dataProvider + * The data provider to set variables in * @throws RedirectException * if the processing page wants to redirect after processing */ - protected void processTemplate(Request request, Template template) throws RedirectException { + protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException { + /* do nothing. */ + } + + /** + * This method will be called after + * {@link #processTemplate(net.pterodactylus.sone.web.page.Page.Request, DataProvider)} + * has processed the template and the template was rendered. This method + * will not be called if + * {@link #processTemplate(net.pterodactylus.sone.web.page.Page.Request, DataProvider)} + * throws a {@link RedirectException}! + * + * @param request + * The request being processed + * @param dataProvider + * The data provider that supplied the rendered data + */ + protected void postProcess(Request request, DataProvider dataProvider) { /* do nothing. */ } @@ -169,7 +214,7 @@ public class TemplatePage implements Page, LinkEnabledCallback { /** * Exception that can be thrown to signal that a subclassed {@link Page} * wants to redirect the user during the - * {@link TemplatePage#processTemplate(net.pterodactylus.sone.web.page.Page.Request, Template)} + * {@link TemplatePage#processTemplate(net.pterodactylus.sone.web.page.Page.Request, DataProvider)} * method call. * * @author David ‘Bombe’ Roden