Merge pull request #78 from GoogleCloudPlatform:jetty-updates

PiperOrigin-RevId: 580560087 Change-Id: I737f9aeb4925132993fe5a725bc3b38b2ca75ad2
GoogleCloudPlatform · Nov 8, 2023 · eef7388 · eef7388
2 parents 4225f88 + 1708b7a
commit eef7388
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/...y12/src/main/java/com/google/appengine/tools/development/jetty/JettyContainerService.java b/...y12/src/main/java/com/google/appengine/tools/development/jetty/JettyContainerService.java
@@ -443,7 +443,7 @@ public boolean accept(File dir, String name) {
           }
         });
     scanner.addListener(new ScannerListener());
-    scanner.doStart();
+    scanner.start();
   }
 
   @Override

diff --git a/...rc/main/java/com/google/appengine/tools/development/jetty/ee10/JettyContainerService.java b/...rc/main/java/com/google/appengine/tools/development/jetty/ee10/JettyContainerService.java
@@ -447,7 +447,7 @@ public boolean accept(File dir, String name) {
           }
         });
     scanner.addListener(new ScannerListener());
-    scanner.doStart();
+    scanner.start();
   }
 
   @Override

diff --git a/...y9/src/main/java/com/google/appengine/tools/development/jetty9/JettyContainerService.java b/...y9/src/main/java/com/google/appengine/tools/development/jetty9/JettyContainerService.java
@@ -420,7 +420,7 @@ public boolean accept(File dir, String name) {
           }
         });
     scanner.addListener(new ScannerListener());
-    scanner.doStart();
+    scanner.start();
   }
 
   @Override
@@ -463,7 +463,7 @@ private File getScanTarget() throws Exception {
     }
   }
 
-  private void fullWebAppScanner(int interval) throws IOException {
+  private void fullWebAppScanner(int interval) throws Exception {
     String webInf = context.getWebInf().getFile().getPath();
     List<File> scanList = new ArrayList<>();
     Collections.addAll(
@@ -488,7 +488,7 @@ public void filesChanged(List<String> changedFiles) throws Exception {
           }
         });
 
-    scanner.doStart();
+    scanner.start();
   }
 
   /**

diff --git a/...etty12/src/main/java/com/google/apphosting/runtime/jetty/ee10/AppEngineWebAppContext.java b/...etty12/src/main/java/com/google/apphosting/runtime/jetty/ee10/AppEngineWebAppContext.java
@@ -28,7 +28,6 @@
 import com.google.apphosting.utils.servlet.ee10.SnapshotServlet;
 import com.google.apphosting.utils.servlet.ee10.WarmupServlet;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.flogger.GoogleLogger;
 import jakarta.servlet.DispatcherType;
 import jakarta.servlet.Filter;
 import jakarta.servlet.Servlet;
@@ -161,11 +160,13 @@ public AppEngineWebAppContext(File appDir, String serverInfo, boolean extractWar
 
     // Configure the Jetty SecurityHandler to understand our method of
     // authentication (via the UserService).
-    setSecurityHandler(EE10AppEngineAuthentication.newSecurityHandler());
+    EE10AppEngineAuthentication.configureSecurityHandler(
+        (ConstraintSecurityHandler) getSecurityHandler());
 
     setMaxFormContentSize(MAX_RESPONSE_SIZE);
 
-    addFilter(new ParseBlobUploadFilter(), "/*", EnumSet.allOf(DispatcherType.class));
+    // TODO: Can we change to a jetty-core handler? what to do on ASYNC?
+    addFilter(new ParseBlobUploadFilter(), "/*", EnumSet.of(DispatcherType.REQUEST));
     ignoreContentLength = isAppIdForNonContentLength();
   }