X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FGigi.java;h=d153758ee31037dfaaf3d5b5794f01b13d27e50c;hb=f0b9b09f6cc96110ec0974d085bd05bef403a9c6;hp=e426a6d473ccae82888a04af845750c870668acf;hpb=b70d7d710cea55608c132d3768c25ee7bed16bd0;p=gigi.git diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index e426a6d4..d153758e 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -6,6 +6,7 @@ import java.io.UnsupportedEncodingException; import java.security.KeyStore; import java.security.cert.X509Certificate; import java.util.Calendar; +import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; import java.util.Locale; @@ -29,6 +30,7 @@ import org.cacert.gigi.output.SimpleMenuItem; import org.cacert.gigi.output.template.Form.CSRFException; import org.cacert.gigi.output.template.Outputable; import org.cacert.gigi.output.template.Template; +import org.cacert.gigi.pages.HandlesMixedRequest; import org.cacert.gigi.pages.LoginPage; import org.cacert.gigi.pages.LogoutPage; import org.cacert.gigi.pages.MainPage; @@ -61,53 +63,42 @@ import org.cacert.gigi.util.ServerConstants; public class Gigi extends HttpServlet { - private boolean firstInstanceInited = false; - - public static final String LOGGEDIN = "loggedin"; + private class MenuBuilder { - public static final String CERT_SERIAL = "org.cacert.gigi.serial"; + private LinkedList categories = new LinkedList(); - public static final String CERT_ISSUER = "org.cacert.gigi.issuer"; + private HashMap pages = new HashMap(); - public static final String USER = "user"; + private Menu rootMenu; - public static final String LOGIN_METHOD = "org.cacert.gigi.loginMethod"; + public MenuBuilder() {} - private static final long serialVersionUID = -6386785421902852904L; - - private Template baseTemplate; - - private LinkedList categories = new LinkedList(); - - private HashMap pages = new HashMap(); - - private HashMap reveresePages = new HashMap(); - - private Menu rootMenu; - - private static Gigi instance; - - private PingerDaemon pinger; - - private KeyStore truststore; + private void putPage(String path, Page p, String category) { + pages.put(path, p); + if (category == null) { + return; + } + Menu m = getMenu(category); + m.addItem(new PageMenuItem(p, path.replaceFirst("/?\\*$", ""))); - private boolean testing; + } - public Gigi(Properties conf, KeyStore truststore) { - if (instance != null) { - throw new IllegalStateException("Multiple Gigi instances!"); + private Menu getMenu(String category) { + Menu m = null; + for (Menu menu : categories) { + if (menu.getMenuName().equals(category)) { + m = menu; + break; + } + } + if (m == null) { + m = new Menu(category); + categories.add(m); + } + return m; } - testing = conf.getProperty("testing") != null; - instance = this; - DatabaseConnection.init(conf); - this.truststore = truststore; - pinger = new PingerDaemon(truststore); - pinger.start(); - } - @Override - public void init() throws ServletException { - if ( !firstInstanceInited) { + public Menu generateMenu() throws ServletException { putPage("/denied", new AccessDenied(), null); putPage("/error", new PageNotFound(), null); putPage("/login", new LoginPage("Password Login"), "CAcert.org"); @@ -180,51 +171,106 @@ public class Gigi extends HttpServlet { } rootMenu.prepare(); - firstInstanceInited = true; + return rootMenu; + } + + public Map getPages() { + return Collections.unmodifiableMap(pages); } - super.init(); } - private void putPage(String path, Page p, String category) { - pages.put(path, p); - reveresePages.put(p, path); - if (category == null) { + public static final String LOGGEDIN = "loggedin"; + + public static final String CERT_SERIAL = "org.cacert.gigi.serial"; + + public static final String CERT_ISSUER = "org.cacert.gigi.issuer"; + + public static final String USER = "user"; + + public static final String LOGIN_METHOD = "org.cacert.gigi.loginMethod"; + + private static final long serialVersionUID = -6386785421902852904L; + + private static Gigi instance; + + private Template baseTemplate; + + private PingerDaemon pinger; + + private KeyStore truststore; + + private boolean testing; + + private Menu rootMenu; + + private Map pages; + + private boolean firstInstanceInited = false; + + public Gigi(Properties conf, KeyStore truststore) { + synchronized (Gigi.class) { + if (instance != null) { + throw new IllegalStateException("Multiple Gigi instances!"); + } + testing = conf.getProperty("testing") != null; + instance = this; + DatabaseConnection.init(conf); + this.truststore = truststore; + pinger = new PingerDaemon(truststore); + pinger.start(); + } + } + + @Override + public synchronized void init() throws ServletException { + if (firstInstanceInited) { + super.init(); return; } - Menu m = getMenu(category); - m.addItem(new PageMenuItem(p)); + MenuBuilder mb = new MenuBuilder(); + rootMenu = mb.generateMenu(); + pages = mb.getPages(); + firstInstanceInited = true; + super.init(); } - private Menu getMenu(String category) { - Menu m = null; - for (Menu menu : categories) { - if (menu.getMenuName().equals(category)) { - m = menu; - break; - } + private Page getPage(String pathInfo) { + if (pathInfo.endsWith("/") && !pathInfo.equals("/")) { + pathInfo = pathInfo.substring(0, pathInfo.length() - 1); } - if (m == null) { - m = new Menu(category); - categories.add(m); + Page page = pages.get(pathInfo); + if (page != null) { + return page; + } + page = pages.get(pathInfo + "/*"); + if (page != null) { + return page; + } + int idx = pathInfo.lastIndexOf('/'); + + page = pages.get(pathInfo.substring(0, idx) + "/*"); + if (page != null) { + return page; + } + + int lIdx = pathInfo.lastIndexOf('/', idx); + if (lIdx == -1) { + return null; } - return m; + page = pages.get(pathInfo.substring(0, lIdx) + "/" + pathInfo.substring(idx)); + return page; + } - private static String staticTemplateVarHttp; + private static String staticTemplateVarHttp = "http://" + ServerConstants.getStaticHostNamePort(); - private static String staticTemplateVarHttps; + private static String staticTemplateVarHttps = "https://" + ServerConstants.getStaticHostNamePortSecure(); 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; } } @@ -292,7 +338,7 @@ public class Gigi extends HttpServlet { public void output(PrintWriter out, Language l, Map vars) { try { if (req.getMethod().equals("POST")) { - if (req.getQueryString() != null) { + if (req.getQueryString() != null && !(p instanceof HandlesMixedRequest)) { return; } p.doPost(req, resp); @@ -331,79 +377,46 @@ public class Gigi extends HttpServlet { } - 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; - } - page = pages.get(pathInfo + "/*"); - if (page != null) { - return page; - } - int idx = pathInfo.lastIndexOf('/'); - pathInfo = pathInfo.substring(0, idx); - - page = pages.get(pathInfo + "/*"); - if (page != null) { - return page; - } - return null; - - } - 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"); if (doHttps) { - hsr.addHeader("Content-Security-Policy", getHttpsCSP()); + hsr.addHeader("Content-Security-Policy", httpsCSP); } else { - hsr.addHeader("Content-Security-Policy", getHttpCSP()); + hsr.addHeader("Content-Security-Policy", httpCSP); } hsr.addHeader("Strict-Transport-Security", "max-age=31536000"); } - 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 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 http://api.cacert.org/security/csp/report"); - httpCSP = csp.toString(); - } - return httpCSP; + private static String httpsCSP = genHttpsCSP(); + + private static String httpCSP = genHttpCSP(); + + private static String genHttpsCSP() { + 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"); + return csp.toString(); } - public static String getPathByPage(Page p) { - return instance.reveresePages.get(p).replaceFirst("/?\\*$", ""); + private static String genHttpCSP() { + 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 http://api.cacert.org/security/csp/report"); + return csp.toString(); } /**