Issue #9906 Empty path info

jetty · Jun 13, 2023 · eab758f · eab758f
1 parent d3e88a9
commit eab758f
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 19 deletions.
diff --git a/...etty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java b/...etty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java
@@ -313,23 +313,6 @@ public void dump(Appendable out, String indent) throws IOException
             new DumpableCollection("initparams " + this, getInitParams().entrySet()));
     }
 
-    /**
-     * @return the allowNullPathInfo true if /context is not redirected to /context/
-     */
-    @ManagedAttribute("Checks if the /context is not redirected to /context/")
-    public boolean getAllowNullPathInfo()
-    {
-        return _allowNullPathInfo;
-    }
-
-    /**
-     * @param allowNullPathInfo true if /context is not redirected to /context/
-     */
-    public void setAllowNullPathInfo(boolean allowNullPathInfo)
-    {
-        _allowNullPathInfo = allowNullPathInfo;
-    }
-
     public boolean isUsingSecurityManager()
     {
         return _usingSecurityManager;

diff --git a/...-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java b/...-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletHandler.java
@@ -468,7 +468,7 @@ public boolean handle(Request request, Response response, Callback callback) thr
      */
     public MatchedResource<MappedServlet> getMatchedServlet(String target)
     {
-        if (target.startsWith("/"))
+        if (target.startsWith("/") || target.length() == 0)
         {
             if (_servletPathMap == null)
                 return null;

diff --git a/...-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletContextHandlerTest.java b/...-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletContextHandlerTest.java
@@ -2432,4 +2432,35 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
         String setCookieValue = response.get(HttpHeader.SET_COOKIE);
         assertThat(setCookieValue, containsString("example=bogus; SameSite=Strict"));
     }
+
+    @Test
+    public void testEmptyPathInfo() throws Exception
+    {
+        ServletContextHandler context = new ServletContextHandler(null, "/c1", ServletContextHandler.NO_SESSIONS);
+        context.setAllowNullPathInContext(true);
+        context.addServlet(new ServletHolder("default-servlet", new HttpServlet()
+        {
+            @Override
+            protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+            {
+                resp.setContentType("text/plain");
+                resp.setCharacterEncoding("UTF-8");
+                resp.getWriter().write("OK2\n");
+                resp.getWriter().close();
+            }
+        }), "/");
+
+        _server.setHandler(context);
+        _server.start();
+        String rawRequest = """
+            GET /c1 HTTP/1.1\r
+            Host: localhost\r
+            Connection: close\r
+            \r
+            """;
+
+        String rawResponse = _connector.getResponse(rawRequest);
+        HttpTester.Response response = HttpTester.parseResponse(rawResponse);
+        assertThat(response.getContent(), containsString("OK"));
+    }
 }
diff --git a/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletHandler.java b/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletHandler.java
@@ -546,7 +546,7 @@ public void doHandle(String target, Request baseRequest, HttpServletRequest requ
      */
     public MatchedResource<MappedServlet> getMatchedServlet(String target)
     {
-        if (target.startsWith("/"))
+        if (target.startsWith("/") || target.length() == 0)
         {
             if (_servletPathMap == null)
                 return null;

diff --git a/...ty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletContextHandlerTest.java b/...ty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletContextHandlerTest.java
@@ -2272,4 +2272,35 @@ public void init() throws ServletException
         assertThat(response, containsString("200 OK"));
         assertThat(response, containsString("/three"));
     }
+
+    @Test
+    public void testEmptyPathInfo() throws Exception
+    {
+        ServletContextHandler context = new ServletContextHandler(null, "/c1", ServletContextHandler.NO_SESSIONS);
+        context.setAllowNullPathInfo(true);
+        context.addServlet(new ServletHolder("default-servlet", new HttpServlet()
+        {
+            @Override
+            protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+            {
+                resp.setContentType("text/plain");
+                resp.setCharacterEncoding("UTF-8");
+                resp.getWriter().write("OK2\n");
+                resp.getWriter().close();
+            }
+        }), "/");
+
+        _server.setHandler(context);
+        _server.start();
+        String rawRequest = """
+            GET /c1 HTTP/1.1\r
+            Host: localhost\r
+            Connection: close\r
+            \r
+            """;
+
+        String rawResponse = _connector.getResponse(rawRequest);
+        HttpTester.Response response = HttpTester.parseResponse(rawResponse);
+        assertThat(response.getContent(), containsString("OK"));
+    }
 }