X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=96afcb9d073cde511a7aefa7c6e4e51e0fc3fdcc;hp=39af0f77d1fdbb9a87672d3ab506c8b7d4bfb217;hb=5ebbedcc1826e6055a742d8d1d193c557cf43cc6;hpb=432df77a9076b964d72f2b78c5d715a33c755b9c diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index 39af0f77..96afcb9d 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -1,12 +1,11 @@ package org.cacert.gigi; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStreamReader; +import java.io.PrintWriter; import java.util.Calendar; import java.util.HashMap; +import java.util.Map; import java.util.Properties; import javax.servlet.ServletException; @@ -17,23 +16,26 @@ import javax.servlet.http.HttpSession; import org.cacert.gigi.database.DatabaseConnection; import org.cacert.gigi.email.EmailProvider; +import org.cacert.gigi.output.Outputable; +import org.cacert.gigi.output.Template; import org.cacert.gigi.pages.LoginPage; import org.cacert.gigi.pages.MainPage; import org.cacert.gigi.pages.Page; -import org.cacert.gigi.pages.PolicyRedir; import org.cacert.gigi.pages.TestSecure; import org.cacert.gigi.pages.Verify; +import org.cacert.gigi.pages.account.MailAdd; import org.cacert.gigi.pages.account.MailCertificates; +import org.cacert.gigi.pages.account.MailOverview; import org.cacert.gigi.pages.account.MyDetails; import org.cacert.gigi.pages.main.RegisterPage; import org.cacert.gigi.pages.wot.AssurePage; -import org.eclipse.jetty.util.log.Log; +import org.cacert.gigi.util.ServerConstants; public class Gigi extends HttpServlet { public static final String LOGGEDIN = "loggedin"; public static final String USER = "user"; private static final long serialVersionUID = -6386785421902852904L; - private String[] baseTemplate; + private Template baseTemplate; private HashMap pages = new HashMap(); public Gigi(Properties conf) { @@ -46,28 +48,27 @@ public class Gigi extends HttpServlet { pages.put("/", new MainPage("CACert - Home")); pages.put("/secure", new TestSecure()); pages.put(Verify.PATH, new Verify()); - pages.put(AssurePage.PATH, new AssurePage()); + pages.put(AssurePage.PATH + "/*", new AssurePage()); pages.put(MailCertificates.PATH, new MailCertificates()); pages.put(MyDetails.PATH, new MyDetails()); pages.put(RegisterPage.PATH, new RegisterPage()); - pages.put(PolicyRedir.PATH, new PolicyRedir()); - String templ = ""; - try (BufferedReader reader = new BufferedReader(new InputStreamReader( - new FileInputStream(new File("templates/base.html"))))) { - String tmp; - while ((tmp = reader.readLine()) != null) { - templ += tmp; - } - baseTemplate = templ.split("\\$content\\$"); - } catch (Exception e) { - Log.getLogger(Gigi.class).warn("Error loading template!", e); - } + pages.put(MailOverview.DEFAULT_PATH, new MailOverview( + "My email addresses")); + pages.put(MailAdd.DEFAULT_PATH, new MailAdd("Add new email")); + baseTemplate = new Template(new InputStreamReader( + Gigi.class.getResourceAsStream("Gigi.templ"))); super.init(); } @Override - protected void service(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException { + protected void service(final HttpServletRequest req, + final HttpServletResponse resp) throws ServletException, + IOException { + addXSSHeaders(resp); + if (req.getHeader("Origin") != null) { + resp.getWriter().println("No cross domain access allowed."); + return; + } HttpSession hs = req.getSession(); if (req.getPathInfo() != null && req.getPathInfo().equals("/logout")) { if (hs != null) { @@ -78,7 +79,7 @@ public class Gigi extends HttpServlet { return; } - Page p = getPage(req.getPathInfo()); + final Page p = getPage(req.getPathInfo()); if (p != null) { if (p.needsLogin() && hs.getAttribute("loggedin") == null) { @@ -91,26 +92,40 @@ public class Gigi extends HttpServlet { if (p.beforeTemplate(req, resp)) { return; } + HashMap vars = new HashMap(); - String b0 = baseTemplate[0]; - b0 = makeDynTempl(b0, p); resp.setContentType("text/html; charset=utf-8"); - resp.getWriter().print(b0); - if (req.getMethod().equals("POST")) { - p.doPost(req, resp); - } else { - p.doGet(req, resp); - } - String b1 = baseTemplate[1]; - b1 = makeDynTempl(b1, p); - resp.getWriter().print(b1); + Outputable content = new Outputable() { + + @Override + public void output(PrintWriter out, Language l, + Map vars) { + try { + if (req.getMethod().equals("POST")) { + p.doPost(req, resp); + } else { + p.doGet(req, resp); + } + } catch (IOException e) { + e.printStackTrace(); + } + + } + }; + vars.put("title", p.getTitle()); + vars.put("static", ServerConstants.getStaticHostNamePort()); + vars.put("year", Calendar.getInstance().get(Calendar.YEAR)); + vars.put("content", content); + baseTemplate.output(resp.getWriter(), Page.getLanguage(req), vars); } else { resp.sendError(404, "Page not found."); } } private Page getPage(String pathInfo) { - + if (pathInfo.endsWith("/") && !pathInfo.equals("/")) { + pathInfo = pathInfo.substring(0, pathInfo.length() - 1); + } Page page = pages.get(pathInfo); if (page != null) { return page; @@ -129,11 +144,36 @@ public class Gigi extends HttpServlet { return null; } - private String makeDynTempl(String in, Page p) { - int year = Calendar.getInstance().get(Calendar.YEAR); - in = in.replaceAll("\\$title\\$", p.getTitle()); - in = in.replaceAll("\\$year\\$", year + ""); - return in; - } + public static void addXSSHeaders(HttpServletResponse hsr) { + hsr.addHeader("Access-Control-Allow-Origin", "https://" + + ServerConstants.getWwwHostNamePort() + " https://" + + ServerConstants.getSecureHostNamePort()); + hsr.addHeader("Access-Control-Max-Age", "60"); + + hsr.addHeader("Content-Security-Policy", getDefaultCSP()); + + } + private static String defaultCSP = null; + private static String getDefaultCSP() { + if (defaultCSP == null) { + StringBuffer csp = new StringBuffer(); + csp.append("default-src 'none';"); + csp.append("font-src https://" + + ServerConstants.getStaticHostNamePort()); + csp.append(";img-src https://" + + ServerConstants.getStaticHostNamePort()); + csp.append(";media-src 'none'; object-src 'none';"); + csp.append("script-src https://" + + ServerConstants.getStaticHostNamePort()); + csp.append(";style-src https://" + + ServerConstants.getStaticHostNamePort()); + csp.append(";form-action https://" + + ServerConstants.getSecureHostNamePort() + " https://" + + ServerConstants.getWwwHostNamePort()); + csp.append("report-url https://api.cacert.org/security/csp/report"); + defaultCSP = csp.toString(); + } + return defaultCSP; + } }