Require an authority for HTTP/2 requests

Author: markt-asf

java/org/apache/coyote/http2/Stream.java

@@ -602,7 +602,8 @@ final boolean receivedEndOfHeaders() throws StreamException {
             }
         } else {
             // All other methods
-            if (coyoteRequest.scheme().isNull() || coyoteRequest.requestURI().isNull()) {
+            if (coyoteRequest.scheme().isNull() || coyoteRequest.requestURI().isNull() ||
+                    coyoteRequest.serverName().isNull()) {
                 missingHeader = true;
             }
         }

test/org/apache/coyote/http2/TestHttp2Section_8_1.java

@@ -301,7 +301,7 @@ public void testHostHeaderInvalid() throws Exception {
         parser.readFrame();
 
         String trace = output.getTrace();
-        Assert.assertTrue(trace, trace.contains("3-Header-[:status]-[400]"));
+        Assert.assertTrue(trace, trace.contains("3-RST-[1]"));
     }
 
 
@@ -325,7 +325,7 @@ public void testAuthorityHeaderInvalid() throws Exception {
         parser.readFrame();
 
         String trace = output.getTrace();
-        Assert.assertTrue(trace, trace.contains("3-Header-[:status]-[400]"));
+        Assert.assertTrue(trace, trace.contains("3-RST-[1]"));
     }
 
 

webapps/docs/changelog.xml

@@ -313,6 +313,11 @@
         When processing an HTTP upgrade from HTTP/1.1 to HTTP/2, ensure that all
         the HTTP/1.1 data has been processed before switching protocols. (markt)
       </fix>
+      <fix>
+        Require every HTTP/2 request to provide an authority (either an
+        <code>:authority</code> pseudo header or a <code>Host</code> header).
+        (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Jasper">