X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=3f0cb7980fea7bd20dbc2805ca680838996ff368;hp=cc824b77dff65322fc327d92e064ab3694984943;hb=99ef9ee7f8d4a2332e4f08c7a0b23cc84966f555;hpb=5c0d50fe77e5212380a11f7a692b569b4cec098a diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index cc824b77..3f0cb798 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -2,6 +2,7 @@ package org.cacert.gigi; import java.io.IOException; import java.io.PrintWriter; +import java.security.KeyStore; import java.util.Calendar; import java.util.HashMap; import java.util.LinkedList; @@ -22,8 +23,10 @@ import org.cacert.gigi.output.Outputable; import org.cacert.gigi.output.PageMenuItem; import org.cacert.gigi.output.template.Template; import org.cacert.gigi.pages.LoginPage; +import org.cacert.gigi.pages.LogoutPage; import org.cacert.gigi.pages.MainPage; import org.cacert.gigi.pages.Page; +import org.cacert.gigi.pages.StaticPage; import org.cacert.gigi.pages.TestSecure; import org.cacert.gigi.pages.Verify; import org.cacert.gigi.pages.account.CertificateAdd; @@ -35,6 +38,8 @@ import org.cacert.gigi.pages.account.MyDetails; import org.cacert.gigi.pages.error.PageNotFound; import org.cacert.gigi.pages.main.RegisterPage; import org.cacert.gigi.pages.wot.AssurePage; +import org.cacert.gigi.pages.wot.MyPoints; +import org.cacert.gigi.ping.PingerDaemon; import org.cacert.gigi.util.ServerConstants; public class Gigi extends HttpServlet { @@ -59,21 +64,26 @@ public class Gigi extends HttpServlet { private static Gigi instance; - public Gigi(Properties conf) { + private PingerDaemon pinger; + + public Gigi(Properties conf, KeyStore truststore) { if (instance != null) { - new IllegalStateException("Multiple Gigi instances!"); + throw new IllegalStateException("Multiple Gigi instances!"); } instance = this; DatabaseConnection.init(conf); + pinger = new PingerDaemon(truststore); + pinger.start(); } @Override public void init() throws ServletException { if ( !firstInstanceInited) { putPage("/error", new PageNotFound(), null); - putPage("/login", new LoginPage("CACert - Login"), "Join CAcert.org"); - putPage("/", new MainPage("CACert - Home"), null); + putPage("/login", new LoginPage("CAcert - Login"), "Join CAcert.org"); + putPage("/", new MainPage("CAcert - Home"), null); putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account"); + putPage(LogoutPage.PATH, new LogoutPage("Logout"), "My Account"); putPage("/secure", new TestSecure(), null); putPage(Verify.PATH, new Verify(), null); putPage(AssurePage.PATH + "/*", new AssurePage(), "CAcert Web of Trust"); @@ -82,9 +92,11 @@ public class Gigi extends HttpServlet { putPage(RegisterPage.PATH, new RegisterPage(), "Join CAcert.org"); putPage(CertificateAdd.PATH, new CertificateAdd(), "Certificates"); putPage(MailOverview.DEFAULT_PATH, new MailOverview("My email addresses"), "Certificates"); - putPage(DomainOverview.PATH, new DomainOverview("Domains"), "Certificates"); + putPage(DomainOverview.PATH + "*", new DomainOverview("Domains"), "Certificates"); + putPage(MyPoints.PATH, new MyPoints("My Points"), "CAcert Web of Trust"); + putPage("/wot/rules", new StaticPage("CAcert Web of Trust Rules", AssurePage.class.getResourceAsStream("Rules.templ")), "CAcert Web of Trust"); baseTemplate = new Template(Gigi.class.getResource("Gigi.templ")); - rootMenu = new Menu("Main", ""); + rootMenu = new Menu("Main"); for (Menu menu : categories) { menu.prepare(); rootMenu.addItem(menu); @@ -109,33 +121,47 @@ public class Gigi extends HttpServlet { } } if (m == null) { - m = new Menu(category, ""); + m = new Menu(category); categories.add(m); } m.addItem(new PageMenuItem(p)); } + private static String staticTemplateVarHttp; + + private static String staticTemplateVarHttps; + + private static String getStaticTemplateVar(boolean https) { + if (https) { + if (staticTemplateVarHttps == null) { + staticTemplateVarHttps = "https://" + ServerConstants.getStaticHostNamePortSecure(); + } + return staticTemplateVarHttps; + } else { + if (staticTemplateVarHttp == null) { + staticTemplateVarHttp = "http://" + ServerConstants.getStaticHostNamePort(); + } + return staticTemplateVarHttp; + } + } + @Override protected void service(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException { - addXSSHeaders(resp); + boolean isSecure = req.getServerPort() == ServerConstants.getSecurePort(); + addXSSHeaders(resp, isSecure); // 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) { - hs.setAttribute(LOGGEDIN, null); - hs.invalidate(); - } - resp.sendRedirect("/"); - return; - } - final Page p = getPage(req.getPathInfo()); - if (p != null) { + if (p != null) { + if ( !isSecure && (p.needsLogin() || p instanceof LoginPage || p instanceof RegisterPage)) { + resp.sendRedirect("https://" + ServerConstants.getWwwHostNamePortSecure() + req.getPathInfo()); + return; + } User currentPageUser = LoginPage.getUser(req); if ( !p.isPermitted(currentPageUser) && hs.getAttribute("loggedin") == null) { String request = req.getPathInfo(); @@ -177,8 +203,8 @@ public class Gigi extends HttpServlet { }; vars.put(Menu.USER_VALUE, currentPageUser); vars.put("menu", rootMenu); - vars.put("title", p.getTitle()); - vars.put("static", ServerConstants.getStaticHostNamePort()); + vars.put("title", Page.getLanguage(req).getTranslation(p.getTitle())); + vars.put("static", getStaticTemplateVar(isSecure)); vars.put("year", Calendar.getInstance().get(Calendar.YEAR)); vars.put("content", content); baseTemplate.output(resp.getWriter(), Page.getLanguage(req), vars); @@ -211,35 +237,56 @@ public class Gigi extends HttpServlet { } - public static void addXSSHeaders(HttpServletResponse hsr) { - hsr.addHeader("Access-Control-Allow-Origin", "https://" + ServerConstants.getWwwHostNamePort() + " https://" + ServerConstants.getSecureHostNamePort()); + public static void addXSSHeaders(HttpServletResponse hsr, boolean doHttps) { + hsr.addHeader("Access-Control-Allow-Origin", "https://" + ServerConstants.getWwwHostNamePortSecure() + " https://" + ServerConstants.getSecureHostNamePort()); hsr.addHeader("Access-Control-Max-Age", "60"); - - hsr.addHeader("Content-Security-Policy", getDefaultCSP()); + if (doHttps) { + hsr.addHeader("Content-Security-Policy", getHttpsCSP()); + } else { + hsr.addHeader("Content-Security-Policy", getHttpCSP()); + } hsr.addHeader("Strict-Transport-Security", "max-age=31536000"); } - private static String defaultCSP = null; + private static String httpsCSP = null; + + private static String httpCSP = null; + + private static String getHttpsCSP() { + if (httpsCSP == null) { + StringBuffer csp = new StringBuffer(); + csp.append("default-src 'none'"); + csp.append(";font-src https://" + ServerConstants.getStaticHostNamePortSecure()); + csp.append(";img-src https://" + ServerConstants.getStaticHostNamePortSecure()); + csp.append(";media-src 'none'; object-src 'none'"); + csp.append(";script-src https://" + ServerConstants.getStaticHostNamePortSecure()); + csp.append(";style-src https://" + ServerConstants.getStaticHostNamePortSecure()); + csp.append(";form-action https://" + ServerConstants.getSecureHostNamePort() + " https://" + ServerConstants.getWwwHostNamePortSecure()); + csp.append(";report-url https://api.cacert.org/security/csp/report"); + httpsCSP = csp.toString(); + } + return httpsCSP; + } - private static String getDefaultCSP() { - if (defaultCSP == null) { + private static String getHttpCSP() { + if (httpCSP == 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("default-src 'none'"); + csp.append(";font-src http://" + ServerConstants.getStaticHostNamePort()); + csp.append(";img-src http://" + ServerConstants.getStaticHostNamePort()); + csp.append(";media-src 'none'; object-src 'none'"); + csp.append(";script-src http://" + ServerConstants.getStaticHostNamePort()); + csp.append(";style-src http://" + 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(); + csp.append(";report-url http://api.cacert.org/security/csp/report"); + httpCSP = csp.toString(); } - return defaultCSP; + return httpCSP; } public static String getPathByPage(Page p) { - return instance.reveresePages.get(p).replaceFirst("\\*$", ""); + return instance.reveresePages.get(p).replaceFirst("/?\\*$", ""); } }