fix: Disable Jetty's webapp configuration (deephaven#6050)

Simplifies embedded server setup slightly, and avoids calling reflective and ServiceLoader based configuration apis. Fixes deephaven#6049
kosak · Sep 18, 2024 · ca4ccb9 · ca4ccb9
1 parent c2b7f68
commit ca4ccb9
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/server/jetty/src/main/java/io/deephaven/server/jetty/JettyBackedGrpcServer.java b/server/jetty/src/main/java/io/deephaven/server/jetty/JettyBackedGrpcServer.java
@@ -47,16 +47,17 @@
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.ErrorPageErrorHandler;
 import org.eclipse.jetty.servlet.FilterHolder;
+import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.servlets.CrossOriginFilter;
 import org.eclipse.jetty.util.MultiException;
 import org.eclipse.jetty.util.component.Graceful;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.eclipse.jetty.webapp.WebAppContext;
 import org.eclipse.jetty.websocket.jakarta.common.SessionTracker;
 import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
 import org.eclipse.jetty.websocket.jakarta.server.internal.JakartaWebSocketServerContainer;
+import org.jetbrains.annotations.Nullable;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -93,17 +94,20 @@ public JettyBackedGrpcServer(
         jetty = new Server();
         jetty.addConnector(createConnector(jetty, config));
 
-        final WebAppContext context =
-                new WebAppContext(null, "/", null, null, null, new ErrorPageErrorHandler(), NO_SESSIONS);
+        final ServletContextHandler context =
+                new ServletContextHandler(null, "/", null, null, null, new ErrorPageErrorHandler(), NO_SESSIONS);
         try {
+            // Build a URL to a known file on the classpath, so Jetty can load resources from that jar to serve as
+            // static content
             String knownFile = "/ide/index.html";
             URL ide = JettyBackedGrpcServer.class.getResource(knownFile);
             Resource jarContents = Resource.newResource(ide.toExternalForm().replace("!" + knownFile, "!/"));
             context.setBaseResource(ControlledCacheResource.wrap(jarContents));
         } catch (IOException ioException) {
             throw new UncheckedIOException(ioException);
         }
-        context.setInitParameter(DefaultServlet.CONTEXT_INIT + "dirAllowed", "false");
+        // Register a DefaultServlet to serve our custom resources
+        context.addServlet(servletHolder("default", null), "/*");
 
         // Cache all of the appropriate assets folders
         for (String appRoot : List.of("/ide/", "/iframe/table/", "/iframe/chart/", "/iframe/widget/")) {
@@ -380,12 +384,14 @@ public void onClosed(Connection connection) {
         return serverConnector;
     }
 
-    private static ServletHolder servletHolder(String name, URI filesystemUri) {
+    private static ServletHolder servletHolder(String name, @Nullable URI filesystemUri) {
         final ServletHolder jsPlugins = new ServletHolder(name, DefaultServlet.class);
-        // Note, the URI needs explicitly be parseable as a directory URL ending in "!/", a requirement of the jetty
-        // resource creation implementation, see
-        // org.eclipse.jetty.util.resource.Resource.newResource(java.lang.String, boolean)
-        jsPlugins.setInitParameter("resourceBase", filesystemUri.toString());
+        if (filesystemUri != null) {
+            // Note, the URI needs explicitly be parseable as a directory URL ending in "!/", a requirement of the jetty
+            // resource creation implementation, see
+            // org.eclipse.jetty.util.resource.Resource.newResource(java.lang.String, boolean)
+            jsPlugins.setInitParameter("resourceBase", filesystemUri.toString());
+        }
         jsPlugins.setInitParameter("pathInfoOnly", "true");
         jsPlugins.setInitParameter("dirAllowed", "false");
         jsPlugins.setAsyncSupported(true);