Fix #6883 relative welcome redirect

Fix #6883 relative welcome redirect + make all redirects able to be relative + added test for relative redirection in ResourceService Signed-off-by: Greg Wilkins <gregw@webtide.com>
jetty · Sep 21, 2021 · 97c29a7 · 97c29a7
1 parent 9b3fb19
commit 97c29a7
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 15 deletions.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceService.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceService.java
@@ -380,23 +380,20 @@ protected void sendWelcome(HttpContent content, String pathInContext, boolean en
         // Redirect to directory
         if (!endsWithSlash)
         {
-            StringBuffer buf = request.getRequestURL();
-            synchronized (buf)
+            StringBuilder buf = new StringBuilder(request.getRequestURI());
+            int param = buf.lastIndexOf(";");
+            if (param < 0 || buf.lastIndexOf("/", param) > 0)
+                buf.append('/');
+            else
+                buf.insert(param, '/');
+            String q = request.getQueryString();
+            if (q != null && q.length() != 0)
             {
-                int param = buf.lastIndexOf(";");
-                if (param < 0)
-                    buf.append('/');
-                else
-                    buf.insert(param, '/');
-                String q = request.getQueryString();
-                if (q != null && q.length() != 0)
-                {
-                    buf.append('?');
-                    buf.append(q);
-                }
-                response.setContentLength(0);
-                response.sendRedirect(response.encodeRedirectURL(buf.toString()));
+                buf.append('?');
+                buf.append(q);
             }
+            response.setContentLength(0);
+            response.sendRedirect(response.encodeRedirectURL(buf.toString()));
             return;
         }
 

diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
@@ -900,6 +900,11 @@ public void testWelcomeRedirect() throws Exception
         assertThat(response, containsHeaderValue("Location", "http://0.0.0.0/context/dir/index.html"));
 
         createFile(inde, "<h1>Hello Inde</h1>");
+        rawResponse = connector.getResponse("GET /context/dir HTTP/1.0\r\n\r\n");
+        response = HttpTester.parseResponse(rawResponse);
+        assertThat(response.toString(), response.getStatus(), is(HttpStatus.MOVED_TEMPORARILY_302));
+        assertThat(response, containsHeaderValue("Location", "http://0.0.0.0/context/dir/"));
+
         rawResponse = connector.getResponse("GET /context/dir/ HTTP/1.0\r\n\r\n");
         response = HttpTester.parseResponse(rawResponse);
         assertThat(response.toString(), response.getStatus(), is(HttpStatus.MOVED_TEMPORARILY_302));
@@ -921,6 +926,46 @@ public void testWelcomeRedirect() throws Exception
         }
     }
 
+    @Test
+    public void testRelativeRedirect() throws Exception
+    {
+        Path dir = docRoot.resolve("dir");
+        FS.ensureDirExists(dir);
+        Path index = dir.resolve("index.html");
+        createFile(index, "<h1>Hello Index</h1>");
+
+        context.addAliasCheck((p, r) -> true);
+        connector.getConnectionFactory(HttpConfiguration.ConnectionFactory.class).getHttpConfiguration().setRelativeRedirectAllowed(true);
+
+        ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
+        defholder.setInitParameter("dirAllowed", "false");
+        defholder.setInitParameter("redirectWelcome", "true");
+        defholder.setInitParameter("welcomeServlets", "false");
+        defholder.setInitParameter("gzip", "false");
+
+        defholder.setInitParameter("maxCacheSize", "1024000");
+        defholder.setInitParameter("maxCachedFileSize", "512000");
+        defholder.setInitParameter("maxCachedFiles", "100");
+
+        String rawResponse;
+        HttpTester.Response response;
+
+        rawResponse = connector.getResponse("GET /context/dir HTTP/1.0\r\n\r\n");
+        response = HttpTester.parseResponse(rawResponse);
+        assertThat(response.toString(), response.getStatus(), is(HttpStatus.MOVED_TEMPORARILY_302));
+        assertThat(response, containsHeaderValue("Location", "/context/dir/"));
+
+        rawResponse = connector.getResponse("GET /context/dir/ HTTP/1.0\r\n\r\n");
+        response = HttpTester.parseResponse(rawResponse);
+        assertThat(response.toString(), response.getStatus(), is(HttpStatus.MOVED_TEMPORARILY_302));
+        assertThat(response, containsHeaderValue("Location", "/context/dir/index.html"));
+
+        rawResponse = connector.getResponse("GET /context/dir/index.html/ HTTP/1.0\r\n\r\n");
+        response = HttpTester.parseResponse(rawResponse);
+        assertThat(response.toString(), response.getStatus(), is(HttpStatus.MOVED_TEMPORARILY_302));
+        assertThat(response, containsHeaderValue("Location", "/context/dir/index.html"));
+    }
+
     /**
      * Ensure that oddball directory names are served with proper escaping
      */