X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=9b3023b25f0626eb87562106b13601cc6c1860b0;hb=785fe6cd9e7c9116b801aafc443b4f090cce870c;hp=eab09850fdea2acc36f8e41271375647c09e1f02;hpb=06b41fa06bd488f943eae0a16a71babdd2745e24;p=gigi.git diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index eab09850..9b3023b2 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -2,9 +2,11 @@ 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; +import java.util.Locale; import java.util.Map; import java.util.Properties; @@ -20,11 +22,14 @@ import org.cacert.gigi.output.Form.CSRFException; import org.cacert.gigi.output.Menu; import org.cacert.gigi.output.Outputable; import org.cacert.gigi.output.PageMenuItem; +import org.cacert.gigi.output.SimpleMenuItem; 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.PolicyIndex; +import org.cacert.gigi.pages.RootCertPage; import org.cacert.gigi.pages.StaticPage; import org.cacert.gigi.pages.TestSecure; import org.cacert.gigi.pages.Verify; @@ -63,14 +68,18 @@ public class Gigi extends HttpServlet { private static Gigi instance; - private PingerDaemon pinger = new PingerDaemon(); + private PingerDaemon pinger; - public Gigi(Properties conf) { + private KeyStore truststore; + + public Gigi(Properties conf, KeyStore truststore) { if (instance != null) { throw new IllegalStateException("Multiple Gigi instances!"); } instance = this; DatabaseConnection.init(conf); + this.truststore = truststore; + pinger = new PingerDaemon(truststore); pinger.start(); } @@ -80,6 +89,7 @@ public class Gigi extends HttpServlet { putPage("/error", new PageNotFound(), null); putPage("/login", new LoginPage("CAcert - Login"), "Join CAcert.org"); putPage("/", new MainPage("CAcert - Home"), null); + putPage("/roots", new RootCertPage(truststore), "Join CAcert.org"); putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account"); putPage(LogoutPage.PATH, new LogoutPage("Logout"), "My Account"); putPage("/secure", new TestSecure(), null); @@ -95,10 +105,28 @@ public class Gigi extends HttpServlet { 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"); + Menu about = new Menu("About CAcert.org"); + categories.add(about); + + about.addItem(new SimpleMenuItem("//blog.cacert.org/", "CAcert News")); + about.addItem(new SimpleMenuItem("//wiki.cacert.org/", "Wiki Documentation")); + putPage(PolicyIndex.DEFAULT_PATH, new PolicyIndex(), "About CAcert.org"); + about.addItem(new SimpleMenuItem("//wiki.cacert.org/FAQ/Privileges", "Point System")); + about.addItem(new SimpleMenuItem("//bugs.cacert.org/", "Bug Database")); + about.addItem(new SimpleMenuItem("//wiki.cacert.org/Board", "CAcert Board")); + about.addItem(new SimpleMenuItem("//lists.cacert.org/wws", "Mailing Lists")); + about.addItem(new SimpleMenuItem("//blog.CAcert.org/feed", "RSS News Feed")); + + Menu languages = new Menu("Translations"); + for (Locale l : Language.getSupportedLocales()) { + languages.addItem(new SimpleMenuItem("?lang=" + l.toString(), l.getDisplayName(l))); + } + categories.add(languages); for (Menu menu : categories) { menu.prepare(); rootMenu.addItem(menu); } + rootMenu.prepare(); firstInstanceInited = true; } @@ -126,18 +154,45 @@ public class Gigi extends HttpServlet { } + 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.getParameter("lang") != null) { + Locale l = Language.getLocaleFromString(req.getParameter("lang")); + Language lu = Language.getInstance(l); + req.getSession().setAttribute(Language.SESSION_ATTRIB_NAME, lu.getLocale()); + } 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(); @@ -180,7 +235,7 @@ public class Gigi extends HttpServlet { vars.put(Menu.USER_VALUE, currentPageUser); vars.put("menu", rootMenu); vars.put("title", Page.getLanguage(req).getTranslation(p.getTitle())); - vars.put("static", ServerConstants.getStaticHostNamePort()); + 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); @@ -213,35 +268,60 @@ 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 getDefaultCSP() { - if (defaultCSP == null) { + private static String getHttpsCSP() { + if (httpsCSP == 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 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 getHttpCSP() { + if (httpCSP == null) { + StringBuffer csp = new StringBuffer(); + 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("/?\\*$", ""); } + public static void notifyPinger() { + instance.pinger.interrupt(); + } + }