Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/jetty-12.…

…1.x/cancelWrite
jetty · Feb 14, 2025 · ae8c796 · ae8c796
2 parents 6e84081 + c84466c
commit ae8c796
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 7 deletions.
diff --git a/documentation/jetty/modules/code/examples/pom.xml b/documentation/jetty/modules/code/examples/pom.xml
@@ -13,8 +13,8 @@
 
   <properties>
     <jacoco.skip>true</jacoco.skip>
-    <javadoc.skip>true</javadoc.skip>
     <maven.deploy.skip>true</maven.deploy.skip>
+    <maven.javadoc.skip>true</maven.javadoc.skip>
   </properties>
 
   <dependencies>

diff --git a/...y-core/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java b/...y-core/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
@@ -18,6 +18,7 @@
 
 import com.sun.net.httpserver.Authenticator;
 import com.sun.net.httpserver.Authenticator.Result;
+import com.sun.net.httpserver.Filter.Chain;
 import com.sun.net.httpserver.HttpContext;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
@@ -61,13 +62,13 @@ public boolean handle(Request request, Response response, Callback callback)
                     if (auth != null && handleAuthentication(request, response, callback, jettyHttpExchange, auth))
                         return true;
 
-                    _httpHandler.handle(jettyHttpExchange);
+                    new Chain(_httpContext.getFilters(), _httpHandler).doFilter(jettyHttpExchange);
                     callback.succeeded();
                 }
-                catch (Exception ex)
+                catch (Throwable t)
                 {
-                    LOG.debug("Failed to handle", ex);
-                    Response.writeError(request, response, callback, 500, null, ex);
+                    LOG.debug("Failed to handle", t);
+                    Response.writeError(request, response, callback, 500, null, t);
                 }
                 return true;
             }

diff --git a/jetty-core/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/SPIServerTest.java b/jetty-core/jetty-http-spi/src/test/java/org/eclipse/jetty/http/spi/SPIServerTest.java
@@ -21,8 +21,10 @@
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 
 import com.sun.net.httpserver.BasicAuthenticator;
+import com.sun.net.httpserver.Filter;
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpContext;
 import com.sun.net.httpserver.HttpExchange;
@@ -404,4 +406,54 @@ public boolean checkCredentials(String username, String password)
         String body = response.getContentAsString();
         assertThat(body, is("Hello"));
     }
+
+    @Test
+    public void testFilter() throws Exception
+    {
+        final AtomicReference<String> reference = new AtomicReference<String>();
+
+        final HttpContext httpContext = server.createContext("/", new HttpHandler()
+        {
+            public void handle(HttpExchange exchange) throws IOException
+            {
+                assertThat(reference.get(), is("before"));
+                Headers responseHeaders = exchange.getResponseHeaders();
+                responseHeaders.set("Content-Type", "text/plain");
+                exchange.sendResponseHeaders(200, 0);
+
+                OutputStream responseBody = exchange.getResponseBody();
+                responseBody.write("Hello".getBytes(StandardCharsets.ISO_8859_1));
+                responseBody.close();
+            }
+        });
+
+        httpContext.getFilters().add(new Filter()
+        {
+          @Override
+          public void doFilter(HttpExchange exchange, Chain chain) throws IOException 
+          {
+            reference.set("before");
+            chain.doFilter(exchange);
+            reference.set("after");
+
+          }
+
+          @Override
+          public String description() 
+          {
+            return "test";
+          }
+      });
+
+        Request request = client.newRequest("localhost", port)
+            .scheme("http")
+            .method(HttpMethod.GET)
+            .path("/");
+
+        ContentResponse response = request.send();
+        assertThat(response.getStatus(), is(200));
+        String body = response.getContentAsString();
+        assertThat(body, is("Hello"));
+        assertThat(reference.get(), is("after"));
+    }
 }
diff --git a/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/JettyServerFactory.java b/jetty-core/jetty-osgi/src/main/java/org/eclipse/jetty/osgi/JettyServerFactory.java
@@ -22,7 +22,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.StringTokenizer;
 
 import org.eclipse.jetty.deploy.AppLifeCycle;
@@ -73,7 +72,7 @@ public static Server createServer(String name, Dictionary<String, Object> props,
             ClassLoader libExtClassLoader = LibExtClassLoaderHelper.createLibExtClassLoader(null, sharedURLs, contextCl/*JettyServerFactory.class.getClassLoader()*/);
 
             ClassLoader serverClassLoader = libExtClassLoader;
-            
+
             if (LOG.isDebugEnabled())
                 LOG.debug("LibExtClassLoader = {}", libExtClassLoader);
 

diff --git a/pom.xml b/pom.xml
@@ -2866,6 +2866,7 @@
                 <disableSourcepathUsage>true</disableSourcepathUsage>
                 <legacyMode>true</legacyMode>
                 <skippedModules>org.eclipse.jetty.*.demos:.*,
+                  org.eclipse.jetty.ee11:jetty-ee11-test.*,
                   org.eclipse.jetty.ee10:jetty-ee10-test.*,
                   org.eclipse.jetty.ee9:jetty-ee9-test.*,
                   jetty-.*-runner,