4.x backport - 5553 permits access to :authority HTTP/2 pseudo header value

And fix the `HttpServerRequest#autority()` javadoc, which was incorrect.
And have a single source of authority truth between the Http2ServerStream and Http2ServerRequest

(cherry picked from commit 532e428)

Author: NilsRenaud

src/main/java/io/vertx/core/http/HttpServerRequest.java

@@ -137,14 +137,26 @@ default boolean isSSL() {
   String query();
 
   /**
-   * @return the request authority. For HTTP/2 the {@literal :authority} pseudo header is returned, for HTTP/1.x the
-   *         {@literal Host} header is returned or {@code null} when no such header is present. When the authority
-   *         string does not carry a port, the {@link HostAndPort#port()} returns {@code -1} to indicate the
-   *         scheme port is prevalent.
+   * @return the request authority.
+   *         <ul>
+   *           <li>HTTP/2: the {@literal :authority} pseudo header is returned if present, otherwise the {@literal Host}
+   *           header value is returned.
+   *           <li>HTTP/1.x: the {@literal Host} header is returned
+   *           <li>or {@code null} when no such header is present
+   *         </ul>
+   *         When the authority string does not carry a port, the {@link HostAndPort#port()} returns {@code -1} to
+   *         indicate the scheme port is prevalent.
    */
   @Nullable
   HostAndPort authority();
 
+  /**
+   * @param real whether to return the value of the real HTTP/2 {@literal :authority} header, or the computed one.
+   * @return the authority, either computed or real. May be null when {@literal real} is {@code true}.
+   */
+  @Nullable
+  HostAndPort authority(boolean real);
+
   /**
    * @return the request host. For HTTP2 it returns the {@literal :authority} pseudo header otherwise it returns the {@literal Host} header
    * @deprecated instead use {@link #authority()}

src/main/java/io/vertx/core/http/impl/Http1xServerRequest.java

@@ -275,6 +275,11 @@ public HostAndPort authority() {
     return authority;
   }
 
+  @Override
+  public HostAndPort authority(boolean real) {
+    return real ? null : authority();
+  }
+
   @Override
   public @Nullable String host() {
     return getHeader(HttpHeaderNames.HOST);

src/main/java/io/vertx/core/http/impl/Http2ServerConnection.java

@@ -85,7 +85,7 @@ private static boolean isMalformedRequest(Http2ServerStream request) {
     }
 
     if (request.method == HttpMethod.CONNECT) {
-      if (request.scheme != null || request.uri != null || request.authority == null) {
+      if (request.scheme != null || request.uri != null || request.authority() == null) {
         return true;
       }
     } else {
@@ -94,13 +94,13 @@ private static boolean isMalformedRequest(Http2ServerStream request) {
       }
     }
     if (request.hasAuthority) {
-      if (request.authority == null) {
+      if (request.authority() == null) {
         return true;
       }
       CharSequence hostHeader = request.headers.get(HttpHeaders.HOST);
       if (hostHeader != null) {
         HostAndPort host = HostAndPort.parseAuthority(hostHeader.toString(), -1);
-        return host == null || (!request.authority.host().equals(host.host()) || request.authority.port() != host.port());
+        return host == null || (!request.authority().host().equals(host.host()) || request.authority().port() != host.port());
       }
     }
     return false;
@@ -129,18 +129,20 @@ String determineContentEncoding(Http2Headers headers) {
 
   private Http2ServerStream createStream(Http2Headers headers, boolean streamEnded) {
     CharSequence schemeHeader = headers.getAndRemove(HttpHeaders.PSEUDO_SCHEME);
-    HostAndPort authority = null;
+    HostAndPort computedAuthority = null;
+    HostAndPort realAuthority = null;
     String authorityHeaderAsString;
     CharSequence authorityHeader = headers.getAndRemove(HttpHeaders.PSEUDO_AUTHORITY);
     if (authorityHeader != null) {
       authorityHeaderAsString = authorityHeader.toString();
-      authority = HostAndPort.parseAuthority(authorityHeaderAsString, -1);
+      realAuthority = HostAndPort.parseAuthority(authorityHeaderAsString, -1);
+      computedAuthority = realAuthority;
     }
     CharSequence hostHeader = null;
-    if (authority == null) {
+    if (computedAuthority == null) {
       hostHeader = headers.getAndRemove(HttpHeaders.HOST);
       if (hostHeader != null) {
-        authority = HostAndPort.parseAuthority(hostHeader.toString(), -1);
+        computedAuthority = HostAndPort.parseAuthority(hostHeader.toString(), -1);
       }
     }
     CharSequence pathHeader = headers.getAndRemove(HttpHeaders.PSEUDO_PATH);
@@ -151,7 +153,8 @@ private Http2ServerStream createStream(Http2Headers headers, boolean streamEnded
       headers,
       schemeHeader != null ? schemeHeader.toString() : null,
       authorityHeader != null || hostHeader != null,
-      authority,
+      realAuthority,
+      computedAuthority,
       methodHeader != null ? HttpMethod.valueOf(methodHeader.toString()) : null,
       pathHeader != null ? pathHeader.toString() : null,
       options.getTracingPolicy(), streamEnded);

src/main/java/io/vertx/core/http/impl/Http2ServerRequest.java

@@ -328,7 +328,12 @@ public String host() {
 
   @Override
   public @Nullable HostAndPort authority() {
-    return stream.authority;
+    return stream.authority();
+  }
+
+  @Override
+  public @Nullable HostAndPort authority(boolean real) {
+    return stream.authority(real);
   }
 
   @Override

src/main/java/io/vertx/core/http/impl/Http2ServerResponse.java

@@ -727,7 +727,7 @@ public Future<HttpServerResponse> push(HttpMethod method, HostAndPort authority,
       throw new IllegalStateException("A push response cannot promise another push");
     }
     if (authority == null) {
-      authority = stream.authority;
+      authority = stream.authority();
     }
     synchronized (conn) {
       checkValid();
@@ -747,7 +747,7 @@ public Future<HttpServerResponse> push(HttpMethod method, String authority, Stri
       hostAndPort = HostAndPort.parseAuthority(authority, -1);
     }
     if (hostAndPort == null) {
-      hostAndPort = stream.authority;
+      hostAndPort = stream.authority();
     }
     synchronized (conn) {
       checkValid();

src/main/java/io/vertx/core/http/impl/Http2ServerStream.java

@@ -41,7 +41,8 @@ class Http2ServerStream extends VertxHttp2Stream<Http2ServerConnection> {
   protected final String uri;
   protected final String host; // deprecated
   protected final boolean hasAuthority;
-  protected final HostAndPort authority;
+  private final HostAndPort computedAuthority;
+  private final HostAndPort realAuthority;
   private final TracingPolicy tracingPolicy;
   private Object metric;
   private Object trace;
@@ -64,7 +65,8 @@ class Http2ServerStream extends VertxHttp2Stream<Http2ServerConnection> {
     this.scheme = null;
     this.host = null;
     this.hasAuthority = false;
-    this.authority = null;
+    this.computedAuthority = null;
+    this.realAuthority = null;
     this.tracingPolicy = tracingPolicy;
     this.halfClosedRemote = halfClosedRemote;
   }
@@ -74,7 +76,8 @@ class Http2ServerStream extends VertxHttp2Stream<Http2ServerConnection> {
                     Http2Headers headers,
                     String scheme,
                     boolean hasAuthority,
-                    HostAndPort authority,
+                    HostAndPort realAuthority,
+                    HostAndPort computedAuthority,
                     HttpMethod method,
                     String uri,
                     TracingPolicy tracingPolicy,
@@ -84,8 +87,9 @@ class Http2ServerStream extends VertxHttp2Stream<Http2ServerConnection> {
     this.scheme = scheme;
     this.headers = headers;
     this.hasAuthority = hasAuthority;
-    this.authority = authority;
-    this.host = authority != null ? authority.toString() : null;
+    this.realAuthority = realAuthority;
+    this.computedAuthority = computedAuthority;
+    this.host = computedAuthority != null ? computedAuthority.toString() : null;
     this.uri = uri;
     this.method = method;
     this.tracingPolicy = tracingPolicy;
@@ -105,6 +109,14 @@ void registerMetrics() {
     }
   }
 
+  public HostAndPort authority() {
+    return computedAuthority;
+  }
+
+  public HostAndPort authority(boolean real) {
+    return real ? realAuthority : computedAuthority;
+  }
+
   @Override
   void onHeaders(Http2Headers headers, StreamPriority streamPriority) {
     if (streamPriority != null) {

src/main/java/io/vertx/core/http/impl/HttpServerRequestWrapper.java

@@ -118,6 +118,11 @@ public HostAndPort authority() {
     return delegate.authority();
   }
 
+  @Override
+  public @Nullable HostAndPort authority(boolean real) {
+    return delegate.authority(real);
+  }
+
   @Override
   public boolean isValidAuthority() {
     return delegate.isValidAuthority();

src/test/java/io/vertx/core/http/Http2ClientTest.java

@@ -346,6 +346,7 @@ public void testOverrideAuthority() throws Exception {
       assertEquals("localhost:4444", req.host());
       assertEquals("localhost", req.authority().host());
       assertEquals(4444, req.authority().port());
+      assertEquals(req.authority(), req.authority(true));
       req.response().end();
     });
     startServer(testAddress);
@@ -360,26 +361,19 @@ public void testOverrideAuthority() throws Exception {
 
   @Test
   public void testNoAuthority() throws Exception {
-    ServerBootstrap bootstrap = createH2Server((decoder, encoder) -> new Http2EventAdapter() {
-      @Override
-      public void onHeadersRead(ChannelHandlerContext ctx, int streamId, Http2Headers headers, int streamDependency, short weight, boolean exclusive, int padding, boolean endStream) throws Http2Exception {
-        vertx.runOnContext(v -> {
-          assertNull(headers.authority());
-          encoder.writeHeaders(ctx, streamId, new DefaultHttp2Headers().status("200"), 0, true, ctx.newPromise());
-          ctx.flush();
-        });
-      }
+    server.requestHandler(req -> {
+      assertEquals("fromHost", req.authority().host());
+      assertEquals(1234, req.authority().port());
+      assertNull(req.authority(true));
+      req.response().end();
     });
-    ChannelFuture s = bootstrap.bind(DEFAULT_HTTPS_HOST, DEFAULT_HTTPS_PORT).sync();
+    startServer(testAddress);
     client.request(new RequestOptions().setServer(testAddress)
-        .setPort(4444)
-        .setHost("localhost")
-      )
-      .compose(request -> {
-        request.authority(null);
-        return request.send();
-      })
-      .onComplete(onSuccess(resp -> testComplete()));
+                                       .addHeader("Host", "fromHost:1234")
+          )
+          .onSuccess(req -> req.authority(null))
+          .compose(HttpClientRequest::send)
+          .onComplete(onSuccess(resp -> testComplete()));
     await();
   }