UPD: Restructuring gigi main class to be safe from concurrent anythings.

diff --git a/src/org/cacert/gigi/DevelLauncher.java b/src/org/cacert/gigi/DevelLauncher.java
index fe19ebd479250362b90e22afa29927f34ae1be4c..431b922d298b76137884029b7b04e651db775079 100644 (file)
--- a/src/org/cacert/gigi/DevelLauncher.java
+++ b/src/org/cacert/gigi/DevelLauncher.java
@@ -14,7 +14,9 @@ import java.lang.reflect.Field;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 
 import javax.servlet.http.HttpServletRequest;
@@ -75,7 +77,7 @@ public class DevelLauncher {
             instF.setAccessible(true);
             pageF.setAccessible(true);
             Object gigi = instF.get(null);
-            HashMap<String, Page> pages = (HashMap<String, Page>) pageF.get(gigi);
+            HashMap<String, Page> pages = new HashMap<>((Map<String, Page>) pageF.get(gigi));
             pages.put("/manage", new Page("Page-manager") {
 
                 @Override
@@ -103,6 +105,7 @@ public class DevelLauncher {
                     return false;
                 }
             });
+            pageF.set(gigi, Collections.unmodifiableMap(pages));
         } catch (ReflectiveOperationException e) {
             e.printStackTrace();
         }

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 31920c36bbc965762cfb3b226b8011f811ec96f6..6af640ead48ddf2b83a8a2905f8415ff46c6d85d 100644 (file)
--- 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;
@@ -61,7 +62,121 @@ import org.cacert.gigi.util.ServerConstants;
 
 public class Gigi extends HttpServlet {
 
-    private boolean firstInstanceInited = false;
+    private class MenuBuilder {
+
+        private LinkedList<Menu> categories = new LinkedList<Menu>();
+
+        private HashMap<String, Page> pages = new HashMap<String, Page>();
+
+        private Menu rootMenu;
+
+        public MenuBuilder() {}
+
+        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 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;
+        }
+
+        public Menu generateMenu() throws ServletException {
+            putPage("/denied", new AccessDenied(), null);
+            putPage("/error", new PageNotFound(), null);
+            putPage("/login", new LoginPage("Password Login"), "CAcert.org");
+            getMenu("CAcert.org").addItem(new SimpleMenuItem("https://" + ServerConstants.getSecureHostNamePort() + "/login", "Certificate Login") {
+
+                @Override
+                public boolean isPermitted(User u) {
+                    return u == null;
+                }
+            });
+            putPage("/", new MainPage("CAcert - Home"), null);
+            putPage("/roots", new RootCertPage(truststore), "CAcert.org");
+            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(), "Web of Trust");
+            putPage(Certificates.PATH + "/*", new Certificates(), "Certificates");
+            putPage(MyDetails.PATH, new MyDetails(), "My Account");
+            putPage(RegisterPage.PATH, new RegisterPage(), "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(MyPoints.PATH, new MyPoints("My Points"), "Web of Trust");
+            putPage(RequestTTPPage.PATH, new RequestTTPPage(), "Web of Trust");
+            putPage(TTPAdminPage.PATH + "/*", new TTPAdminPage(), "Admin");
+            putPage(CreateOrgPage.DEFAULT_PATH, new CreateOrgPage(), "Organisation Admin");
+            putPage(ViewOrgPage.DEFAULT_PATH + "/*", new ViewOrgPage(), "Organisation Admin");
+            putPage(FindDomainPage.PATH, new FindDomainPage("Find Domain"), "System Admin");
+            putPage(FindUserPage.PATH, new FindUserPage("Find User"), "System Admin");
+            putPage(SupportUserDetailsPage.PATH + "*", new SupportUserDetailsPage("Support: User Details"), null);
+            if (testing) {
+                try {
+                    Class<?> manager = Class.forName("org.cacert.gigi.pages.Manager");
+                    Page p = (Page) manager.getMethod("getInstance").invoke(null);
+                    String pa = (String) manager.getField("PATH").get(null);
+                    putPage(pa + "/*", p, "Gigi test server");
+                } catch (ReflectiveOperationException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            try {
+                putPage("/wot/rules", new StaticPage("Web of Trust Rules", AssurePage.class.getResourceAsStream("Rules.templ")), "Web of Trust");
+            } catch (UnsupportedEncodingException e) {
+                throw new ServletException(e);
+            }
+            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();
+            return rootMenu;
+        }
+
+        public Map<String, Page> getPages() {
+            return Collections.unmodifiableMap(pages);
+        }
+    }
 
     public static final String LOGGEDIN = "loggedin";
 
@@ -75,23 +190,21 @@ public class Gigi extends HttpServlet {
 
     private static final long serialVersionUID = -6386785421902852904L;
 
+    private static Gigi instance;
+
     private Template baseTemplate;
 
-    private LinkedList<Menu> categories = new LinkedList<Menu>();
+    private PingerDaemon pinger;
 
-    private HashMap<String, Page> pages = new HashMap<String, Page>();
+    private KeyStore truststore;
 
-    private HashMap<Page, String> reveresePages = new HashMap<Page, String>();
+    private boolean testing;
 
     private Menu rootMenu;
 
-    private static Gigi instance;
+    private Map<String, Page> pages;
 
-    private PingerDaemon pinger;
-
-    private KeyStore truststore;
-
-    private boolean testing;
+    private boolean firstInstanceInited = false;
 
     public Gigi(Properties conf, KeyStore truststore) {
         synchronized (Gigi.class) {
@@ -113,106 +226,35 @@ public class Gigi extends HttpServlet {
             super.init();
             return;
         }
-        putPage("/denied", new AccessDenied(), null);
-        putPage("/error", new PageNotFound(), null);
-        putPage("/login", new LoginPage("Password Login"), "CAcert.org");
-        getMenu("CAcert.org").addItem(new SimpleMenuItem("https://" + ServerConstants.getSecureHostNamePort() + "/login", "Certificate Login") {
-
-            @Override
-            public boolean isPermitted(User u) {
-                return u == null;
-            }
-        });
-        putPage("/", new MainPage("CAcert - Home"), null);
-        putPage("/roots", new RootCertPage(truststore), "CAcert.org");
-        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(), "Web of Trust");
-        putPage(Certificates.PATH + "/*", new Certificates(), "Certificates");
-        putPage(MyDetails.PATH, new MyDetails(), "My Account");
-        putPage(RegisterPage.PATH, new RegisterPage(), "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(MyPoints.PATH, new MyPoints("My Points"), "Web of Trust");
-        putPage(RequestTTPPage.PATH, new RequestTTPPage(), "Web of Trust");
-        putPage(TTPAdminPage.PATH + "/*", new TTPAdminPage(), "Admin");
-        putPage(CreateOrgPage.DEFAULT_PATH, new CreateOrgPage(), "Organisation Admin");
-        putPage(ViewOrgPage.DEFAULT_PATH + "/*", new ViewOrgPage(), "Organisation Admin");
-        putPage(FindDomainPage.PATH, new FindDomainPage("Find Domain"), "System Admin");
-        putPage(FindUserPage.PATH, new FindUserPage("Find User"), "System Admin");
-        putPage(SupportUserDetailsPage.PATH + "*", new SupportUserDetailsPage("Support: User Details"), null);
-        if (testing) {
-            try {
-                Class<?> manager = Class.forName("org.cacert.gigi.pages.Manager");
-                Page p = (Page) manager.getMethod("getInstance").invoke(null);
-                String pa = (String) manager.getField("PATH").get(null);
-                putPage(pa + "/*", p, "Gigi test server");
-            } catch (ReflectiveOperationException e) {
-                e.printStackTrace();
-            }
-        }
+        MenuBuilder mb = new MenuBuilder();
+        rootMenu = mb.generateMenu();
+        pages = mb.getPages();
 
-        try {
-            putPage("/wot/rules", new StaticPage("Web of Trust Rules", AssurePage.class.getResourceAsStream("Rules.templ")), "Web of Trust");
-        } catch (UnsupportedEncodingException e) {
-            throw new ServletException(e);
-        }
-        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;
         super.init();
     }
 
-    private void putPage(String path, Page p, String category) {
-        pages.put(path, p);
-        reveresePages.put(p, path);
-        if (category == null) {
-            return;
+    private Page getPage(String pathInfo) {
+        if (pathInfo.endsWith("/") && !pathInfo.equals("/")) {
+            pathInfo = pathInfo.substring(0, pathInfo.length() - 1);
         }
-        Menu m = getMenu(category);
-        m.addItem(new PageMenuItem(p, path.replaceFirst("/?\\*$", "")));
-
-    }
-
-    private Menu getMenu(String category) {
-        Menu m = null;
-        for (Menu menu : categories) {
-            if (menu.getMenuName().equals(category)) {
-                m = menu;
-                break;
-            }
+        Page page = pages.get(pathInfo);
+        if (page != null) {
+            return page;
         }
-        if (m == null) {
-            m = new Menu(category);
-            categories.add(m);
+        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 m;
+        return null;
+
     }
 
     private static String staticTemplateVarHttp = "http://" + ServerConstants.getStaticHostNamePort();
@@ -229,9 +271,6 @@ public class Gigi extends HttpServlet {
 
     @Override
     protected void service(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
-        if ( !firstInstanceInited) {
-            return;
-        }
         boolean isSecure = req.getServerPort() == ServerConstants.getSecurePort();
         addXSSHeaders(resp, isSecure);
         // Firefox only sends this, if it's a cross domain access; safari sends
@@ -332,29 +371,6 @@ 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");