chg: ensure actor, target and support ticket are non-null

[gigi.git] / src / club / wpia / gigi / Launcher.java

diff --git a/src/club/wpia/gigi/Launcher.java b/src/club/wpia/gigi/Launcher.java
index a1cd26938edf91818e58e3ea14ff0c9c3ec09d71..fdcc739b7074112541dd161acf232b9331de39cf 100644 (file)
--- a/src/club/wpia/gigi/Launcher.java
+++ b/src/club/wpia/gigi/Launcher.java
@@ -58,9 +58,11 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
 import club.wpia.gigi.api.GigiAPI;
 import club.wpia.gigi.email.EmailProvider;
 import club.wpia.gigi.natives.SetUID;
+import club.wpia.gigi.ocsp.OCSPResponder;
 import club.wpia.gigi.util.CipherInfo;
 import club.wpia.gigi.util.PEM;
 import club.wpia.gigi.util.ServerConstants;
+import club.wpia.gigi.util.ServerConstants.Host;
 
 public class Launcher {
 
@@ -246,13 +248,13 @@ public class Launcher {
                             if (sniServerName instanceof SNIHostName) {
                                 SNIHostName host = (SNIHostName) sniServerName;
                                 String hostname = host.getAsciiName();
-                                if (hostname.equals(ServerConstants.getWwwHostName())) {
+                                if (hostname.equals(ServerConstants.getHostName(Host.WWW))) {
                                     e2 = sslContextFactory.newSSLEngine();
-                                } else if (hostname.equals(ServerConstants.getStaticHostName())) {
+                                } else if (hostname.equals(ServerConstants.getHostName(Host.STATIC))) {
                                     e2 = staticContextFactory.newSSLEngine();
-                                } else if (hostname.equals(ServerConstants.getSecureHostName())) {
+                                } else if (hostname.equals(ServerConstants.getHostName(Host.SECURE))) {
                                     e2 = secureContextFactory.newSSLEngine();
-                                } else if (hostname.equals(ServerConstants.getApiHostName())) {
+                                } else if (hostname.equals(ServerConstants.getHostName(Host.API))) {
                                     e2 = apiContextFactory.newSSLEngine();
                                 }
                                 break;
@@ -305,7 +307,7 @@ public class Launcher {
     private void initHandlers() throws GeneralSecurityException, IOException {
         HandlerList hl = new HandlerList();
         hl.setHandlers(new Handler[] {
-                ContextLauncher.generateStaticContext(), ContextLauncher.generateGigiContexts(conf.getMainProps(), conf.getTrustStore()), ContextLauncher.generateAPIContext()
+                ContextLauncher.generateStaticContext(), ContextLauncher.generateGigiContexts(conf.getMainProps(), conf.getTrustStore()), ContextLauncher.generateAPIContext(), ContextLauncher.generateOCSPContext()
         });
         s.setHandler(hl);
     }
@@ -319,11 +321,11 @@ public class Launcher {
 
             ContextHandler ch = generateGigiServletContext(webAppServlet);
             ch.setVirtualHosts(new String[] {
-                    ServerConstants.getWwwHostName()
+                    ServerConstants.getHostName(Host.WWW)
             });
             ContextHandler chSecure = generateGigiServletContext(webAppServlet);
             chSecure.setVirtualHosts(new String[] {
-                    ServerConstants.getSecureHostName()
+                    ServerConstants.getHostName(Host.SECURE)
             });
 
             HandlerList hl = new HandlerList();
@@ -337,11 +339,11 @@ public class Launcher {
             final ResourceHandler rh = generateResourceHandler();
             rh.setResourceBase("static/www");
 
-            HandlerWrapper hw = new PolicyRedirector();
+            HandlerWrapper hw = new HandlerWrapper();
             hw.setHandler(rh);
 
             ServletContextHandler servlet = new ServletContextHandler(ServletContextHandler.SESSIONS);
-            servlet.setInitParameter(SessionManager.__SessionCookieProperty, "SomeCA-Session");
+            servlet.setInitParameter(SessionManager.__SessionCookieProperty, ServerConstants.getAppName() + "-Session");
             servlet.addServlet(webAppServlet, "/*");
             ErrorPageErrorHandler epeh = new ErrorPageErrorHandler();
             epeh.addErrorPage(404, "/error");
@@ -365,7 +367,7 @@ public class Launcher {
             ContextHandler ch = new ContextHandler();
             ch.setHandler(rh);
             ch.setVirtualHosts(new String[] {
-                    ServerConstants.getStaticHostName()
+                    ServerConstants.getHostName(Host.STATIC)
             });
 
             return ch;
@@ -388,12 +390,21 @@ public class Launcher {
             ServletContextHandler sch = new ServletContextHandler();
 
             sch.addVirtualHosts(new String[] {
-                    ServerConstants.getApiHostName()
+                    ServerConstants.getHostName(Host.API)
             });
             sch.addServlet(new ServletHolder(new GigiAPI()), "/*");
             return sch;
         }
 
+        protected static Handler generateOCSPContext() {
+            ServletContextHandler sch = new ServletContextHandler();
+
+            sch.addVirtualHosts(new String[] {
+                    ServerConstants.getHostName(Host.OCSP_RESPONDER)
+            });
+            sch.addServlet(new ServletHolder(new OCSPResponder()), "/*");
+            return sch;
+        }
     }
 
 }