Issue #3806 - Make Async sendError fully Async

jetty-http/src/main/java/org/eclipse/jetty/http/HttpStatus.java

@@ -320,6 +320,20 @@ public static String getMessage(int code)
         }
     }
 
+    public static boolean hasNoBody(int status)
+    {
+        switch (status)
+        {
+            case NO_CONTENT_204:
+            case NOT_MODIFIED_304:
+            case PARTIAL_CONTENT_206:
+                return true;
+
+            default:
+                return status < OK_200;
+        }
+    }
+
     /**
      * Simple test against an code to determine if it falls into the
      * <code>Informational</code> message category as defined in the <a

jetty-io/src/main/java/org/eclipse/jetty/io/ByteBufferOutputStream.java

@@ -0,0 +1,62 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.io;
+
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+
+import org.eclipse.jetty.util.BufferUtil;
+
+/**
+ * Simple wrapper of a ByteBuffer as an OutputStream.
+ * The buffer does not grow and this class will throw an
+ * {@link java.nio.BufferOverflowException} if the buffer capacity is exceeded.
+ */
+public class ByteBufferOutputStream extends OutputStream
+{
+    final ByteBuffer _buffer;
+
+    public ByteBufferOutputStream(ByteBuffer buffer)
+    {
+        _buffer = buffer;
+    }
+
+    public void close()
+    {
+    }
+
+    public void flush()
+    {
+    }
+
+    public void write(byte[] b)
+    {
+        write(b, 0, b.length);
+    }
+
+    public void write(byte[] b, int off, int len)
+    {
+        BufferUtil.append(_buffer, b, off, len);
+    }
+
+    public void write(int b)
+    {
+        BufferUtil.append(_buffer, (byte)b);
+    }
+}

jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AbstractProxyServlet.java

@@ -680,6 +680,14 @@ protected void sendProxyResponseError(HttpServletRequest clientRequest, HttpServ
         catch (Exception e)
         {
             _log.ignore(e);
+            try
+            {
+                proxyResponse.sendError(-1);
+            }
+            catch (Exception e2)
+            {
+                _log.ignore(e2);
+            }
         }
         finally
         {

jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ResponsePatternRule.java

@@ -22,6 +22,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.util.StringUtil;
 import org.eclipse.jetty.util.annotation.Name;
 
 /**
@@ -79,11 +81,20 @@ public String apply(String target, HttpServletRequest request, HttpServletRespon
         // status code 400 and up are error codes
         if (code >= 400)
         {
-            response.sendError(code, _reason);
+            if (!StringUtil.isBlank(_reason))
+            {
+                // use both setStatusWithReason (to set the reason) and sendError to set the message
+                Request.getBaseRequest(request).getResponse().setStatusWithReason(code, _reason);
+                response.sendError(code, _reason);
+            }
+            else
+            {
+                response.sendError(code);
+            }
         }
         else
         {
-            response.setStatus(code);
+            response.setStatus(code, _reason);
         }
         return target;
     }

jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ValidUrlRule.java

@@ -22,6 +22,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.util.StringUtil;
 import org.eclipse.jetty.util.URIUtil;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
@@ -88,7 +90,13 @@ public String matchAndApply(String target, HttpServletRequest request, HttpServl
                 // status code 400 and up are error codes so include a reason
                 if (code >= 400)
                 {
-                    response.sendError(code, _reason);
+                    if (StringUtil.isBlank(_reason))
+                        response.sendError(code);
+                    else
+                    {
+                        Request.getBaseRequest(request).getResponse().setStatusWithReason(code, _reason);
+                        response.sendError(code, _reason);
+                    }
                 }
                 else
                 {

jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/ResponsePatternRuleTest.java

@@ -20,6 +20,8 @@
 
 import java.io.IOException;
 
+import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.server.Dispatcher;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -59,7 +61,7 @@ public void testStatusCodeWithReason() throws IOException
             _rule.apply(null, _request, _response);
 
             assertEquals(i, _response.getStatus());
-            assertEquals(null, _response.getReason());
+            assertEquals("reason" + i, _response.getReason());
         }
     }
 
@@ -72,7 +74,7 @@ public void testErrorStatusNoReason() throws IOException
             _rule.apply(null, _request, _response);
 
             assertEquals(i, _response.getStatus());
-            assertEquals("", _response.getReason());
+            assertEquals(HttpStatus.getMessage(i), _request.getAttribute(Dispatcher.ERROR_MESSAGE));
             super.reset();
         }
     }
@@ -87,7 +89,7 @@ public void testErrorStatusWithReason() throws IOException
             _rule.apply(null, _request, _response);
 
             assertEquals(i, _response.getStatus());
-            assertEquals("reason-" + i, _response.getReason());
+            assertEquals("reason-" + i,  _request.getAttribute(Dispatcher.ERROR_MESSAGE));
             super.reset();
         }
     }

jetty-security/src/test/java/org/eclipse/jetty/security/SpecExampleConstraintTest.java

@@ -44,6 +44,7 @@
 
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -321,7 +322,8 @@ public void testBasic() throws Exception
         response = _connector.getResponse("POST /ctx/acme/wholesale/index.html HTTP/1.0\r\n" +
             "Authorization: Basic " + encodedChris + "\r\n" +
             "\r\n");
-        assertThat(response, startsWith("HTTP/1.1 403 !"));
+        assertThat(response, startsWith("HTTP/1.1 403 Forbidden"));
+        assertThat(response, containsString("!Secure"));
 
         //a user in role HOMEOWNER can do a GET
         response = _connector.getResponse("GET /ctx/acme/retail/index.html HTTP/1.0\r\n" +

jetty-security/src/test/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticatorTest.java

@@ -18,6 +18,7 @@
 
 package org.eclipse.jetty.security.authentication;
 
+import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.http.HttpFields;
@@ -26,6 +27,7 @@
 import org.eclipse.jetty.http.MetaData;
 import org.eclipse.jetty.server.Authentication;
 import org.eclipse.jetty.server.HttpChannel;
+import org.eclipse.jetty.server.HttpChannelState;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpOutput;
 import org.eclipse.jetty.server.Request;
@@ -34,6 +36,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -61,21 +65,27 @@ public Server getServer()
             {
                 return null;
             }
-        };
-        Request req = new Request(channel, null);
-        HttpOutput out = new HttpOutput(channel)
-        {
+
             @Override
-            public void close()
+            protected HttpOutput newHttpOutput()
             {
-                return;
+                return new HttpOutput(this)
+                {
+                    @Override
+                    public void close() {}
+
+                    @Override
+                    public void flush() throws IOException {}
+                };
             }
         };
-        Response res = new Response(channel, out);
+        Request req = channel.getRequest();
+        Response res = channel.getResponse();
         MetaData.Request metadata = new MetaData.Request(new HttpFields());
         metadata.setURI(new HttpURI("http://localhost"));
         req.setMetaData(metadata);
 
+        assertThat(channel.getState().handling(), is(HttpChannelState.Action.DISPATCH));
         assertEquals(Authentication.SEND_CONTINUE, _authenticator.validateRequest(req, res, true));
         assertEquals(HttpHeader.NEGOTIATE.asString(), res.getHeader(HttpHeader.WWW_AUTHENTICATE.asString()));
         assertEquals(HttpServletResponse.SC_UNAUTHORIZED, res.getStatus());
@@ -91,24 +101,30 @@ public Server getServer()
             {
                 return null;
             }
-        };
-        Request req = new Request(channel, null);
-        HttpOutput out = new HttpOutput(channel)
-        {
+
             @Override
-            public void close()
+            protected HttpOutput newHttpOutput()
             {
-                return;
+                return new HttpOutput(this)
+                {
+                    @Override
+                    public void close() {}
+
+                    @Override
+                    public void flush() throws IOException {}
+                };
             }
         };
-        Response res = new Response(channel, out);
+        Request req = channel.getRequest();
+        Response res = channel.getResponse();
         HttpFields http_fields = new HttpFields();
         // Create a bogus Authorization header. We don't care about the actual credentials.
         http_fields.add(HttpHeader.AUTHORIZATION, "Basic asdf");
         MetaData.Request metadata = new MetaData.Request(http_fields);
         metadata.setURI(new HttpURI("http://localhost"));
         req.setMetaData(metadata);
 
+        assertThat(channel.getState().handling(), is(HttpChannelState.Action.DISPATCH));
         assertEquals(Authentication.SEND_CONTINUE, _authenticator.validateRequest(req, res, true));
         assertEquals(HttpHeader.NEGOTIATE.asString(), res.getHeader(HttpHeader.WWW_AUTHENTICATE.asString()));
         assertEquals(HttpServletResponse.SC_UNAUTHORIZED, res.getStatus());

jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContextEvent.java

@@ -160,7 +160,7 @@ public void run()
         Scheduler.Task task = _timeoutTask;
         _timeoutTask = null;
         if (task != null)
-            _state.getHttpChannel().execute(() -> _state.onTimeout());
+            _state.timeout();
     }
 
     public void addThrowable(Throwable e)

jetty-server/src/main/java/org/eclipse/jetty/server/Dispatcher.java

@@ -42,8 +42,6 @@ public class Dispatcher implements RequestDispatcher
 {
     private static final Logger LOG = Log.getLogger(Dispatcher.class);
 
-    public static final String __ERROR_DISPATCH = "org.eclipse.jetty.server.Dispatcher.ERROR";
-
     /**
      * Dispatch include attribute names
      */
@@ -83,15 +81,7 @@ public void forward(ServletRequest request, ServletResponse response) throws Ser
 
     public void error(ServletRequest request, ServletResponse response) throws ServletException, IOException
     {
-        try
-        {
-            request.setAttribute(__ERROR_DISPATCH, Boolean.TRUE);
-            forward(request, response, DispatcherType.ERROR);
-        }
-        finally
-        {
-            request.setAttribute(__ERROR_DISPATCH, null);
-        }
+        forward(request, response, DispatcherType.ERROR);
     }
 
     @Override