Merge pull request #348 from GoogleCloudPlatform:ee8-invalidPathSpec

PiperOrigin-RevId: 733945939
Change-Id: I556668b063c3596fe9bc63d48cd3cfb6e30718d4

Author: gae-java-bot

pom.xml

@@ -65,7 +65,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jetty.version>9.4.57.v20241219</jetty.version>
-    <jetty12.version>12.0.16</jetty12.version>
+    <jetty12.version>12.0.17</jetty12.version>
     <io.grpc>1.70.0</io.grpc>
     <io.netty>4.1.119.Final</io.netty>
     <slf4j.version>2.0.17</slf4j.version>

runtime/local_jetty12/src/main/java/com/google/appengine/tools/development/jetty/JettyContainerService.java

@@ -647,7 +647,6 @@ public void doScope(
                 Semaphore semaphore =
                     (Semaphore) env.getAttributes().get(LocalEnvironment.API_CALL_SEMAPHORE);
                 try {
-                  System.err.println("=========== acquire semaphore ===========");
                   semaphore.acquire(MAX_SIMULTANEOUS_API_CALLS);
                 } catch (InterruptedException ex) {
                   Thread.currentThread().interrupt();

runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/ee8/AppEngineWebAppContext.java

@@ -28,6 +28,7 @@
 import com.google.apphosting.utils.servlet.SnapshotServlet;
 import com.google.apphosting.utils.servlet.WarmupServlet;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.flogger.GoogleLogger;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -51,13 +52,15 @@
 import org.eclipse.jetty.ee8.nested.ServletConstraint;
 import org.eclipse.jetty.ee8.security.ConstraintMapping;
 import org.eclipse.jetty.ee8.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.ee8.security.SecurityHandler;
 import org.eclipse.jetty.ee8.servlet.FilterHolder;
 import org.eclipse.jetty.ee8.servlet.FilterMapping;
 import org.eclipse.jetty.ee8.servlet.ListenerHolder;
 import org.eclipse.jetty.ee8.servlet.ServletHandler;
 import org.eclipse.jetty.ee8.servlet.ServletHolder;
 import org.eclipse.jetty.ee8.servlet.ServletMapping;
 import org.eclipse.jetty.ee8.webapp.WebAppContext;
+import org.eclipse.jetty.http.pathmap.PathSpec;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.resource.ResourceFactory;
 
@@ -70,6 +73,7 @@
 // will allow to enable Servlet Async capabilities later, controlled programmatically instead of
 // declaratively in webdefault.xml.
 public class AppEngineWebAppContext extends WebAppContext {
+  private static final GoogleLogger logger = GoogleLogger.forEnclosingClass();
 
   // TODO: This should be some sort of Prometheus-wide
   // constant.  If it's much larger than this we may need to
@@ -151,6 +155,24 @@ public AppEngineWebAppContext(File appDir, String serverInfo, boolean extractWar
     ignoreContentLength = isAppIdForNonContentLength();
   }
 
+  @Override
+  protected SecurityHandler newSecurityHandler() {
+    return new ConstraintSecurityHandler() {
+      @Override
+      protected PathSpec asPathSpec(ConstraintMapping mapping) {
+        try {
+          // As currently written, this allows regex patterns to be used.
+          // This may not be supported by default in future releases.
+          return PathSpec.from(mapping.getPathSpec());
+        } catch (Throwable t) {
+          logger.atWarning().log(
+              "Invalid pathSpec '%s', using literal mapping instead", mapping.getPathSpec());
+          return new LiteralPathSpec(mapping.getPathSpec());
+        }
+      }
+    };
+  }
+
   @Override
   protected ClassLoader configureClassLoader(ClassLoader loader) {
     // Avoid wrapping the provided classloader with WebAppClassLoader.

runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/ee8/LiteralPathSpec.java

@@ -0,0 +1,109 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.apphosting.runtime.jetty.ee8;
+
+import org.eclipse.jetty.http.pathmap.AbstractPathSpec;
+import org.eclipse.jetty.http.pathmap.MatchedPath;
+import org.eclipse.jetty.http.pathmap.PathSpecGroup;
+import org.eclipse.jetty.util.StringUtil;
+
+public class LiteralPathSpec extends AbstractPathSpec
+{
+    private final String _pathSpec;
+    private final int _pathDepth;
+
+    public LiteralPathSpec(String pathSpec)
+    {
+        if (StringUtil.isEmpty(pathSpec))
+            throw new IllegalArgumentException();
+        _pathSpec = pathSpec;
+
+        int pathDepth = 0;
+        for (int i = 0; i < _pathSpec.length(); i++)
+        {
+            char c = _pathSpec.charAt(i);
+            if (c < 128)
+            {
+                if (c == '/')
+                    pathDepth++;
+            }
+        }
+        _pathDepth = pathDepth;
+    }
+
+    @Override
+    public int getSpecLength()
+    {
+        return _pathSpec.length();
+    }
+
+    @Override
+    public PathSpecGroup getGroup()
+    {
+        return PathSpecGroup.EXACT;
+    }
+
+    @Override
+    public int getPathDepth()
+    {
+        return _pathDepth;
+    }
+
+    @Override
+    public String getPathInfo(String path)
+    {
+        return _pathSpec.equals(path) ? "" : null;
+    }
+
+    @Override
+    public String getPathMatch(String path)
+    {
+        return _pathSpec.equals(path) ? _pathSpec : null;
+    }
+
+    @Override
+    public String getDeclaration()
+    {
+        return _pathSpec;
+    }
+
+    @Override
+    public String getPrefix()
+    {
+        return null;
+    }
+
+    @Override
+    public String getSuffix()
+    {
+        return null;
+    }
+
+    @Override
+    public MatchedPath matched(String path)
+    {
+        if (_pathSpec.equals(path))
+            return MatchedPath.from(_pathSpec, null);
+        return null;
+    }
+
+    @Override
+    public boolean matches(String path)
+    {
+        return _pathSpec.equals(path);
+    }
+}