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

…move-demos

jetty-ee11/jetty-ee11-annotations/src/main/java/org/eclipse/jetty/ee11/annotations/AnnotationConfiguration.java

@@ -351,7 +351,7 @@ public void addStartupClasses(Class<?>... clazzes)
         protected Set<Class<?>> resolveStartupClasses() throws Exception
         {
             final Set<Class<?>> classes = new HashSet<>();
-            WebAppClassLoader.runWithServerClassAccess(() ->
+            WebAppClassLoader.runWithHiddenClassAccess(() ->
             {
                 for (String name:_startupClassNames)
                 {

jetty-ee11/jetty-ee11-cdi/src/main/java/org/eclipse/jetty/ee11/cdi/CdiConfiguration.java

@@ -31,11 +31,11 @@ public CdiConfiguration()
     {
         super(new Builder()
             .protectAndExpose("org.eclipse.jetty.ee11.cdi.CdiServletContainerInitializer")
-            .hide(getHiddenClasses())
+            .hide(getCdiHiddenClasses())
             .addDependents(AnnotationConfiguration.class, PlusConfiguration.class));
     }
 
-    private static String[] getHiddenClasses()
+    private static String[] getCdiHiddenClasses()
     {
         //Only hide the cdi api classes if there is not also an impl on the
         //environment classpath - vital for embedded uses.

jetty-ee11/jetty-ee11-maven-plugin/src/it/jetty-cdi-start-forked/src/main/jetty/jetty-context.xml

@@ -4,7 +4,7 @@
 <!-- Weld needs access to some internal classes. Same configuration as "cdi2" module provides on server. -->
 
 <Configure class="org.eclipse.jetty.ee11.webapp.WebAppContext">
-  <Call name="addServerClassMatcher">
+  <Call name="addHiddenClassMatcher">
     <Arg>
       <New class="org.eclipse.jetty.util.ClassMatcher">
         <Arg>

jetty-ee11/jetty-ee11-osgi/jetty-ee11-osgi-boot/src/main/java/org/eclipse/jetty/ee11/osgi/boot/EE11Activator.java

@@ -293,10 +293,10 @@ public ContextHandler createContextHandler(AbstractContextProvider provider, App
                 try
                 {
                     Thread.currentThread().setContextClassLoader(contextHandler.getClassLoader());
-                    WebAppClassLoader.runWithServerClassAccess(() ->
+                    WebAppClassLoader.runWithHiddenClassAccess(() ->
                     {
                         XmlConfiguration xmlConfiguration = new XmlConfiguration(ResourceFactory.of(contextHandler).newResource(contextXmlURI));
-                        WebAppClassLoader.runWithServerClassAccess(() ->
+                        WebAppClassLoader.runWithHiddenClassAccess(() ->
                         {
                             Map<String, String> properties = new HashMap<>();
                             xmlConfiguration.getIdMap().put("Server", osgiApp.getDeploymentManager().getServer());
@@ -382,7 +382,7 @@ public ContextHandler createContextHandler(AbstractContextProvider provider, App
             try
             {
                 Thread.currentThread().setContextClassLoader(environmentLoader);
-                WebAppClassLoader.runWithServerClassAccess(() ->
+                WebAppClassLoader.runWithHiddenClassAccess(() ->
                 {
                     Configurations.getKnown();
                     return null;
@@ -468,10 +468,10 @@ public ContextHandler createContextHandler(AbstractContextProvider provider, App
                 try
                 {
                     Thread.currentThread().setContextClassLoader(webApp.getClassLoader());
-                    WebAppClassLoader.runWithServerClassAccess(() ->
+                    WebAppClassLoader.runWithHiddenClassAccess(() ->
                     {
                         XmlConfiguration xmlConfiguration = new XmlConfiguration(ResourceFactory.of(webApp).newResource(contextXmlUri));
-                        WebAppClassLoader.runWithServerClassAccess(() ->
+                        WebAppClassLoader.runWithHiddenClassAccess(() ->
                         {
                             Map<String, String> properties = new HashMap<>();
                             xmlConfiguration.getIdMap().put("Server", osgiApp.getDeploymentManager().getServer());

jetty-ee11/jetty-ee11-plus/src/main/java/org/eclipse/jetty/ee11/plus/webapp/EnvConfiguration.java

@@ -87,7 +87,7 @@ public void configure(WebAppContext context) throws Exception
             {
                 XmlConfiguration configuration = new XmlConfiguration(jettyEnvXmlResource);
                 configuration.setJettyStandardIdsAndProperties(context.getServer(), null);
-                WebAppClassLoader.runWithServerClassAccess(() ->
+                WebAppClassLoader.runWithHiddenClassAccess(() ->
                 {
                     configuration.configure(context);
                     return null;

jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/AsyncContextEvent.java

@@ -20,6 +20,7 @@
 import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import org.eclipse.jetty.http.HttpURI;
+import org.eclipse.jetty.util.ExceptionUtil;
 import org.eclipse.jetty.util.thread.Scheduler;
 
 public class AsyncContextEvent extends AsyncEvent implements Runnable
@@ -149,9 +150,6 @@ public void run()
 
     public void addThrowable(Throwable e)
     {
-        if (_throwable == null)
-            _throwable = e;
-        else if (e != _throwable)
-            _throwable.addSuppressed(e);
+        _throwable = ExceptionUtil.combine(_throwable, e);
     }
 }

jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/Dispatcher.java

@@ -39,9 +39,11 @@
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpServletResponseWrapper;
 import org.eclipse.jetty.ee11.servlet.util.ServletOutputStreamWrapper;
+import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.http.HttpURI;
 import org.eclipse.jetty.http.pathmap.MatchedResource;
 import org.eclipse.jetty.io.WriterOutputStream;
+import org.eclipse.jetty.server.handler.ErrorHandler;
 import org.eclipse.jetty.util.Fields;
 import org.eclipse.jetty.util.IO;
 import org.eclipse.jetty.util.StringUtil;
@@ -765,9 +767,12 @@ public Enumeration<String> getAttributeNames()
 
     private class ErrorRequest extends ParameterRequestWrapper
     {
-        public ErrorRequest(HttpServletRequest httpRequest)
+        private final HttpServletRequest _httpServletRequest;
+
+        public ErrorRequest(HttpServletRequest httpServletRequest)
         {
-            super(httpRequest);
+            super(httpServletRequest);
+            _httpServletRequest = Objects.requireNonNull(httpServletRequest);
         }
 
         @Override
@@ -776,16 +781,22 @@ public DispatcherType getDispatcherType()
             return DispatcherType.ERROR;
         }
 
+        @Override
+        public String getMethod()
+        {
+            return HttpMethod.GET.asString();
+        }
+
         @Override
         public String getPathInfo()
         {
-            return _servletPathMapping.getPathInfo();
+            return Objects.requireNonNull(_servletPathMapping).getPathInfo();
         }
 
         @Override
         public String getServletPath()
         {
-            return _servletPathMapping.getServletPath();
+            return Objects.requireNonNull(_servletPathMapping).getServletPath();
         }
 
         @Override
@@ -797,7 +808,7 @@ public HttpServletMapping getHttpServletMapping()
         @Override
         public String getRequestURI()
         {
-            return _uri.getPath();
+            return Objects.requireNonNull(_uri).getPath();
         }
 
         @Override
@@ -809,6 +820,28 @@ public StringBuffer getRequestURL()
                 .port(getServerPort())
                 .asString());
         }
+
+        @Override
+        public Object getAttribute(String name)
+        {
+            return switch (name)
+            {
+                case ERROR_METHOD -> _httpServletRequest.getMethod();
+                case ERROR_REQUEST_URI -> _httpServletRequest.getRequestURI();
+                case ERROR_QUERY_STRING -> _httpServletRequest.getQueryString();
+                case ERROR_STATUS_CODE -> super.getAttribute(ErrorHandler.ERROR_STATUS);
+                case ERROR_MESSAGE -> super.getAttribute(ErrorHandler.ERROR_MESSAGE);
+                default -> super.getAttribute(name);
+            };
+        }
+
+        @Override
+        public Enumeration<String> getAttributeNames()
+        {
+            List<String> names = new ArrayList<>(List.of(ERROR_METHOD, ERROR_REQUEST_URI, ERROR_QUERY_STRING, ERROR_STATUS_CODE, ERROR_MESSAGE));
+            names.addAll(Collections.list(super.getAttributeNames()));
+            return Collections.enumeration(names);
+        }
     }
 
     @Override

jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ErrorHandler.java

@@ -50,9 +50,8 @@
 
 public class ErrorHandler implements Request.Handler
 {
-    // TODO This classes API needs to be majorly refactored/cleanup in jetty-10
+    // TODO This class's API needs to be majorly refactored/cleanup
     private static final Logger LOG = LoggerFactory.getLogger(ErrorHandler.class);
-    public static final String ERROR_CONTEXT = "org.eclipse.jetty.server.error_context";
     public static final String ERROR_CHARSET = "org.eclipse.jetty.server.error_charset";
 
     boolean _showServlet = true;

jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ErrorPageErrorHandler.java

@@ -23,6 +23,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.eclipse.jetty.server.handler.ErrorHandler.ERROR_STATUS;
+
 /**
  * An ErrorHandler that maps exceptions and status codes to URIs for dispatch using
  * the internal ERROR style of dispatch.
@@ -108,7 +110,7 @@ public String getErrorPage(HttpServletRequest request)
             pageSource = PageLookupTechnique.STATUS_CODE;
 
             // look for an exact code match
-            errorStatusCode = (Integer)request.getAttribute(Dispatcher.ERROR_STATUS_CODE);
+            errorStatusCode = (Integer)request.getAttribute(ERROR_STATUS);
             if (errorStatusCode != null)
             {
                 errorPage = _errorPages.get(Integer.toString(errorStatusCode));

jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java

@@ -843,19 +843,22 @@ public Object getAttribute(String name)
     @Override
     public Enumeration<String> getAttributeNames()
     {
-        Set<String> set = getRequest().getAttributeNameSet();
         if (_async != null)
         {
-            set = new HashSet<>(set);
-            set.add(AsyncContext.ASYNC_REQUEST_URI);
-            set.add(AsyncContext.ASYNC_CONTEXT_PATH);
-            set.add(AsyncContext.ASYNC_SERVLET_PATH);
-            set.add(AsyncContext.ASYNC_PATH_INFO);
-            set.add(AsyncContext.ASYNC_QUERY_STRING);
-            set.add(AsyncContext.ASYNC_MAPPING);
+            Set<String> names = new HashSet<>(Set.of(
+
+                AsyncContext.ASYNC_REQUEST_URI,
+                AsyncContext.ASYNC_CONTEXT_PATH,
+                AsyncContext.ASYNC_SERVLET_PATH,
+                AsyncContext.ASYNC_PATH_INFO,
+                AsyncContext.ASYNC_QUERY_STRING,
+                AsyncContext.ASYNC_MAPPING
+            ));
+            names.addAll(getRequest().getAttributeNameSet());
+            return Collections.enumeration(names);
         }
 
-        return Collections.enumeration(set);
+        return Collections.enumeration(getRequest().getAttributeNameSet());
     }
 
     @Override

jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletChannel.java

@@ -44,6 +44,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.eclipse.jetty.server.handler.ErrorHandler.ERROR_CONTEXT;
 import static org.eclipse.jetty.util.thread.Invocable.InvocationType.NON_BLOCKING;
 
 /**
@@ -459,7 +460,7 @@ public void handle()
 
                             // the following is needed as you cannot trust the response code and reason
                             // as those could have been modified after calling sendError
-                            Integer code = (Integer)_servletContextRequest.getAttribute(RequestDispatcher.ERROR_STATUS_CODE);
+                            Integer code = (Integer)_servletContextRequest.getAttribute(org.eclipse.jetty.server.handler.ErrorHandler.ERROR_STATUS);
                             if (code == null)
                                 code = HttpStatus.INTERNAL_SERVER_ERROR_500;
                             getServletContextResponse().setStatus(code);
@@ -472,7 +473,7 @@ public void handle()
                             if (!_httpInput.consumeAvailable())
                                 ResponseUtils.ensureNotPersistent(_servletContextRequest, _servletContextRequest.getServletContextResponse());
 
-                            ContextHandler.ScopedContext context = (ContextHandler.ScopedContext)_servletContextRequest.getAttribute(ErrorHandler.ERROR_CONTEXT);
+                            ContextHandler.ScopedContext context = (ContextHandler.ScopedContext)_servletContextRequest.getAttribute(ERROR_CONTEXT);
                             Request.Handler errorHandler = ErrorHandler.getErrorHandler(getServer(), context == null ? null : context.getContextHandler());
 
                             // If we can't have a body or have no ErrorHandler, then create a minimal error response.
@@ -527,7 +528,7 @@ public void handle()
                         finally
                         {
                             // clean up the context that was set in Response.sendError
-                            _servletContextRequest.removeAttribute(ErrorHandler.ERROR_CONTEXT);
+                            _servletContextRequest.removeAttribute(ERROR_CONTEXT);
                         }
                         break;
                     }

jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletChannelState.java

@@ -36,10 +36,7 @@
 
 import static jakarta.servlet.RequestDispatcher.ERROR_EXCEPTION;
 import static jakarta.servlet.RequestDispatcher.ERROR_EXCEPTION_TYPE;
-import static jakarta.servlet.RequestDispatcher.ERROR_MESSAGE;
-import static jakarta.servlet.RequestDispatcher.ERROR_REQUEST_URI;
 import static jakarta.servlet.RequestDispatcher.ERROR_SERVLET_NAME;
-import static jakarta.servlet.RequestDispatcher.ERROR_STATUS_CODE;
 
 /**
  * holder of the state of request-response cycle.
@@ -1039,11 +1036,8 @@ public void sendError(int code, String message)
             response.setStatus(code);
             servletContextRequest.errorClose();
 
-            request.setAttribute(org.eclipse.jetty.ee11.servlet.ErrorHandler.ERROR_CONTEXT, servletContextRequest.getErrorContext());
-            request.setAttribute(ERROR_REQUEST_URI, httpServletRequest.getRequestURI());
             request.setAttribute(ERROR_SERVLET_NAME, servletContextRequest.getServletName());
-            request.setAttribute(ERROR_STATUS_CODE, code);
-            request.setAttribute(ERROR_MESSAGE, message);
+            // Additional servlet error attributes are provided in org.eclipse.jetty.ee11.servlet.Dispatcher.ErrorRequest
 
             // Set Jetty Specific Attributes.
             request.setAttribute(ErrorHandler.ERROR_CONTEXT, servletContextRequest.getServletContext());

jetty-ee11/jetty-ee11-servlet/src/test/java/org/eclipse/jetty/ee11/servlet/ErrorPageTest.java

@@ -153,6 +153,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
         assertThat(body, containsString("ERROR_EXCEPTION: null"));
         assertThat(body, containsString("ERROR_EXCEPTION_TYPE: null"));
         assertThat(body, containsString("ERROR_SERVLET: " + errorContentServlet.getClass().getName()));
+        assertThat(body, containsString("ERROR_METHOD: GET"));
         assertThat(body, containsString("ERROR_REQUEST_URI: /error-mime-charset-writer/"));
     }
 
@@ -734,6 +735,61 @@ protected void doGet(HttpServletRequest req, HttpServletResponse response) throw
         assertThat(responseBody, Matchers.containsString("getParameterMap()[    ]=[]"));
     }
 
+    @Test
+    public void testErrorAttributes() throws Exception
+    {
+        ServletContextHandler contextHandler = new ServletContextHandler(ServletContextHandler.NO_SECURITY | ServletContextHandler.NO_SESSIONS);
+        contextHandler.setContextPath("/");
+
+        HttpServlet failServlet = new HttpServlet()
+        {
+            @Override
+            protected void doGet(HttpServletRequest req, HttpServletResponse response) throws IOException
+            {
+                response.sendError(599);
+            }
+
+            @Override
+            protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+            {
+                doGet(req, resp);
+            }
+        };
+
+        contextHandler.addServlet(failServlet, "/fail/599");
+        contextHandler.addServlet(ErrorDumpServlet.class, "/error/*");
+
+        ErrorPageErrorHandler errorPageErrorHandler = new ErrorPageErrorHandler();
+        errorPageErrorHandler.addErrorPage(599, "/error/599");
+        contextHandler.setErrorHandler(errorPageErrorHandler);
+
+        startServer(contextHandler);
+
+        String rawRequest = """
+            POST /fail/599?name=value HTTP/1.1\r
+            Host: test\r
+            Connection: close\r
+            \r
+            """;
+
+        String rawResponse = _connector.getResponse(rawRequest);
+
+        HttpTester.Response response = HttpTester.parseResponse(rawResponse);
+        assertThat(response.getStatus(), is(599));
+        assertThat(response.get(HttpHeader.DATE), notNullValue());
+
+        String responseBody = response.getContent();
+
+        assertThat(responseBody, Matchers.containsString("ERROR_PAGE: /599"));
+        assertThat(responseBody, Matchers.containsString("ERROR_CODE: 599"));
+        assertThat(responseBody, Matchers.containsString("ERROR_EXCEPTION: null"));
+        assertThat(responseBody, Matchers.containsString("ERROR_EXCEPTION_TYPE: null"));
+        assertThat(responseBody, Matchers.containsString("ERROR_SERVLET: " + failServlet.getClass().getName()));
+        assertThat(responseBody, Matchers.containsString("ERROR_METHOD: POST"));
+        assertThat(responseBody, Matchers.containsString("ERROR_REQUEST_URI: /fail/599"));
+        assertThat(responseBody, Matchers.containsString("ERROR_QUERY_STRING: name=value"));
+    }
+
     @Test
     public void testErrorCode() throws Exception
     {
@@ -1733,7 +1789,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp)
     public static class ErrorDumpServlet extends HttpServlet
     {
         @Override
-        protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+        protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
         {
             if (request.getDispatcherType() != DispatcherType.ERROR && request.getDispatcherType() != DispatcherType.ASYNC)
                 throw new IllegalStateException("Bad Dispatcher Type " + request.getDispatcherType());
@@ -1746,7 +1802,9 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
             writer.println("ERROR_EXCEPTION: " + request.getAttribute(Dispatcher.ERROR_EXCEPTION));
             writer.println("ERROR_EXCEPTION_TYPE: " + request.getAttribute(Dispatcher.ERROR_EXCEPTION_TYPE));
             writer.println("ERROR_SERVLET: " + request.getAttribute(Dispatcher.ERROR_SERVLET_NAME));
+            writer.println("ERROR_METHOD: " + request.getAttribute(Dispatcher.ERROR_METHOD));
             writer.println("ERROR_REQUEST_URI: " + request.getAttribute(Dispatcher.ERROR_REQUEST_URI));
+            writer.println("ERROR_QUERY_STRING: " + request.getAttribute(Dispatcher.ERROR_QUERY_STRING));
 
             writer.printf("getRequestURI()=%s%n", valueOf(request.getRequestURI()));
             writer.printf("getRequestURL()=%s%n", valueOf(request.getRequestURL()));