allow the 'host' header to be used on HTTP/2 requests if the ':author…

…ity' header if missing see #5425 Signed-off-by: Jesse White <[email protected]>
eclipse-vertx · Dec 19, 2024 · b5614d9 · b5614d9
1 parent b0c9721
commit b5614d9
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/src/main/java/io/vertx/core/http/impl/Http2ServerConnection.java b/src/main/java/io/vertx/core/http/impl/Http2ServerConnection.java
@@ -137,14 +137,21 @@ private Http2ServerStream createStream(Http2Headers headers, boolean streamEnded
       authorityHeaderAsString = authorityHeader.toString();
       authority = HostAndPort.parseAuthority(authorityHeaderAsString, -1);
     }
+    CharSequence hostHeader = null;
+    if (authority == null) {
+      hostHeader = headers.getAndRemove(HttpHeaders.HOST);
+      if (hostHeader != null) {
+        authority = HostAndPort.parseAuthority(hostHeader.toString(), -1);
+      }
+    }
     CharSequence pathHeader = headers.getAndRemove(HttpHeaders.PSEUDO_PATH);
     CharSequence methodHeader = headers.getAndRemove(HttpHeaders.PSEUDO_METHOD);
     return new Http2ServerStream(
       this,
       streamContextSupplier.get(),
       headers,
       schemeHeader != null ? schemeHeader.toString() : null,
-      authorityHeader != null,
+      authorityHeader != null || hostHeader != null,
       authority,
       methodHeader != null ? HttpMethod.valueOf(methodHeader.toString()) : null,
       pathHeader != null ? pathHeader.toString() : null,

diff --git a/src/test/java/io/vertx/core/http/Http2ServerTest.java b/src/test/java/io/vertx/core/http/Http2ServerTest.java
@@ -39,6 +39,7 @@
 import io.netty.handler.codec.http2.Http2Exception;
 import io.netty.handler.codec.http2.Http2Flags;
 import io.netty.handler.codec.http2.Http2FrameAdapter;
+import io.netty.handler.codec.http2.Http2FrameListener;
 import io.netty.handler.codec.http2.Http2Headers;
 import io.netty.handler.codec.http2.Http2Settings;
 import io.netty.handler.codec.http2.Http2Stream;
@@ -1278,6 +1279,26 @@ public void onPushPromiseRead(ChannelHandlerContext ctx, int streamId, int promi
     await();
   }
 
+  @Test
+  public void testHostHeaderInsteadOfAuthorityPseudoHeader() throws Exception {
+    testValidRequestHeaders(new DefaultHttp2Headers().method("GET").scheme("https").path("/").set("host", DEFAULT_HTTPS_HOST_AND_PORT));
+  }
+
+  private void testValidRequestHeaders(Http2Headers headers) throws Exception {
+    server.requestHandler(req -> {
+      testComplete();
+    });
+    startServer();
+    TestClient client = new TestClient();
+    ChannelFuture fut = client.connect(DEFAULT_HTTPS_PORT, DEFAULT_HTTPS_HOST, request -> {
+      int id = request.nextStreamId();
+      Http2ConnectionEncoder encoder = request.encoder;
+      encoder.writeHeaders(request.context, id, headers, 0, true, request.context.newPromise());
+    });
+    fut.sync();
+    await();
+  }
+
   @Test
   public void testMissingMethodPseudoHeader() throws Exception {
     testMalformedRequestHeaders(new DefaultHttp2Headers().scheme("http").path("/"));