]> WPIA git - gigi.git/blobdiff - src/org/cacert/gigi/Gigi.java
add: Init two db-static initializers non-lazily
[gigi.git] / src / org / cacert / gigi / Gigi.java
index e426a6d473ccae82888a04af845750c870668acf..99b136b8fa089d410b4c3695e4aac7afe01d95ac 100644 (file)
@@ -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;
@@ -20,6 +21,8 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.dbObjects.CACertificate;
+import org.cacert.gigi.dbObjects.CertificateProfile;
 import org.cacert.gigi.dbObjects.DomainPingConfiguration;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
@@ -29,6 +32,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 +65,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<Menu> categories = new LinkedList<Menu>();
 
-    public static final String CERT_ISSUER = "org.cacert.gigi.issuer";
+        private HashMap<String, Page> pages = new HashMap<String, Page>();
 
-    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<Menu> categories = new LinkedList<Menu>();
-
-    private HashMap<String, Page> pages = new HashMap<String, Page>();
-
-    private HashMap<Page, String> reveresePages = new HashMap<Page, String>();
-
-    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 +173,110 @@ public class Gigi extends HttpServlet {
             }
 
             rootMenu.prepare();
-            firstInstanceInited = true;
+            return rootMenu;
+        }
+
+        public Map<String, Page> getPages() {
+            return Collections.unmodifiableMap(pages);
+        }
+    }
+
+    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<String, Page> 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();
         }
-        super.init();
     }
 
-    private void putPage(String path, Page p, String category) {
-        pages.put(path, p);
-        reveresePages.put(p, path);
-        if (category == null) {
+    @Override
+    public synchronized void init() throws ServletException {
+        if (firstInstanceInited) {
+            super.init();
             return;
         }
-        Menu m = getMenu(category);
-        m.addItem(new PageMenuItem(p));
+        // ensure those static initializers are finished
+        CACertificate.getById(1);
+        CertificateProfile.getById(1);
 
+        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);
+        }
+        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;
         }
-        if (m == null) {
-            m = new Menu(category);
-            categories.add(m);
+
+        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 +344,7 @@ public class Gigi extends HttpServlet {
                 public void output(PrintWriter out, Language l, Map<String, Object> 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 +383,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();
     }
 
     /**