Move raw path into HttpPreRequest (#113231)

Currently, the raw path is only available from the RestRequest. This
makes the logic to determine if a handler supports streaming more
challenging to evaluate. This commit moves the raw path into pre request
to allow easier streaming support logic.

Author: Tim-Brooks

modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpRequest.java

@@ -17,6 +17,7 @@
 import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.QueryStringDecoder;
 import io.netty.handler.codec.http.cookie.Cookie;
 import io.netty.handler.codec.http.cookie.ServerCookieDecoder;
 import io.netty.handler.codec.http.cookie.ServerCookieEncoder;
@@ -48,6 +49,7 @@ public class Netty4HttpRequest implements HttpRequest {
     private final Exception inboundException;
     private final boolean pooled;
     private final int sequence;
+    private final QueryStringDecoder queryStringDecoder;
 
     Netty4HttpRequest(int sequence, io.netty.handler.codec.http.HttpRequest request, Netty4HttpRequestBodyStream contentStream) {
         this(
@@ -94,6 +96,7 @@ private Netty4HttpRequest(
         this.pooled = pooled;
         this.released = released;
         this.inboundException = inboundException;
+        this.queryStringDecoder = new QueryStringDecoder(request.uri());
     }
 
     @Override
@@ -106,6 +109,11 @@ public String uri() {
         return request.uri();
     }
 
+    @Override
+    public String rawPath() {
+        return queryStringDecoder.rawPath();
+    }
+
     @Override
     public HttpBody body() {
         assert released.get() == false;

modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpServerTransport.java

@@ -374,10 +374,7 @@ protected HttpMessage createMessage(String[] initialLine) throws Exception {
             // combines the HTTP message pieces into a single full HTTP request (with headers and body)
             final HttpObjectAggregator aggregator = new Netty4HttpAggregator(
                 handlingSettings.maxContentLength(),
-                httpPreRequest -> enabled.get() == false
-                    || (httpPreRequest.uri().contains("_bulk") == false
-                        || httpPreRequest.uri().contains("_bulk_update")
-                        || httpPreRequest.uri().contains("/_xpack/monitoring/_bulk"))
+                httpPreRequest -> enabled.get() == false || (httpPreRequest.rawPath().endsWith("/_bulk") == false)
             );
             aggregator.setMaxCumulationBufferComponents(transport.maxCompositeBufferComponents);
             ch.pipeline()

qa/smoke-test-http/src/javaRestTest/java/org/elasticsearch/http/IncrementalBulkRestIT.java

@@ -29,6 +29,12 @@
 @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE, supportsDedicatedMasters = false, numDataNodes = 2, numClientNodes = 0)
 public class IncrementalBulkRestIT extends HttpSmokeTestCase {
 
+    public void testBulkUriMatchingDoesNotMatchBulkCapabilitiesApi() throws IOException {
+        Request request = new Request("GET", "/_capabilities?method=GET&path=%2F_bulk&capabilities=failure_store_status&pretty");
+        Response response = getRestClient().performRequest(request);
+        assertEquals(200, response.getStatusLine().getStatusCode());
+    }
+
     public void testBulkMissingBody() throws IOException {
         Request request = new Request(randomBoolean() ? "POST" : "PUT", "/_bulk");
         request.setJsonEntity("");

server/src/main/java/org/elasticsearch/http/HttpPreRequest.java

@@ -33,6 +33,24 @@ public interface HttpPreRequest {
      */
     String uri();
 
+    /**
+     * The uri without the query string.
+     */
+    default String rawPath() {
+        String uri = uri();
+        final int index = uri.indexOf('?');
+        if (index >= 0) {
+            return uri.substring(0, index);
+        } else {
+            final int index2 = uri.indexOf('#');
+            if (index2 >= 0) {
+                return uri.substring(0, index2);
+            } else {
+                return uri;
+            }
+        }
+    }
+
     /**
      * Get all of the headers and values associated with the HTTP headers.
      * Modifications of this map are not supported.

server/src/main/java/org/elasticsearch/rest/RestRequest.java

@@ -105,19 +105,19 @@ public boolean isContentConsumed() {
     protected RestRequest(
         XContentParserConfiguration parserConfig,
         Map<String, String> params,
-        String path,
+        String rawPath,
         Map<String, List<String>> headers,
         HttpRequest httpRequest,
         HttpChannel httpChannel
     ) {
-        this(parserConfig, params, path, headers, httpRequest, httpChannel, requestIdGenerator.incrementAndGet());
+        this(parserConfig, params, rawPath, headers, httpRequest, httpChannel, requestIdGenerator.incrementAndGet());
     }
 
     @SuppressWarnings("this-escape")
     private RestRequest(
         XContentParserConfiguration parserConfig,
         Map<String, String> params,
-        String path,
+        String rawPath,
         Map<String, List<String>> headers,
         HttpRequest httpRequest,
         HttpChannel httpChannel,
@@ -149,7 +149,7 @@ private RestRequest(
             : parserConfig.withRestApiVersion(effectiveApiVersion);
         this.httpChannel = httpChannel;
         this.params = params;
-        this.rawPath = path;
+        this.rawPath = rawPath;
         this.headers = Collections.unmodifiableMap(headers);
         this.requestId = requestId;
     }
@@ -204,11 +204,10 @@ void ensureSafeBuffers() {
      */
     public static RestRequest request(XContentParserConfiguration parserConfig, HttpRequest httpRequest, HttpChannel httpChannel) {
         Map<String, String> params = params(httpRequest.uri());
-        String path = path(httpRequest.uri());
         return new RestRequest(
             parserConfig,
             params,
-            path,
+            httpRequest.rawPath(),
             httpRequest.getHeaders(),
             httpRequest,
             httpChannel,
@@ -229,15 +228,6 @@ private static Map<String, String> params(final String uri) {
         return params;
     }
 
-    private static String path(final String uri) {
-        final int index = uri.indexOf('?');
-        if (index >= 0) {
-            return uri.substring(0, index);
-        } else {
-            return uri;
-        }
-    }
-
     /**
      * Creates a new REST request. The path is not decoded so this constructor will not throw a
      * {@link BadParameterException}.