From fa084dc688361b546c80f60a93155d3935f49a1e Mon Sep 17 00:00:00 2001
From: Tim Brooks <tim@timbrooks.org>
Date: Thu, 19 Sep 2024 17:45:08 -0600
Subject: [PATCH] Changes

---
 .../elasticsearch/http/netty4/Netty4HttpRequest.java  |  8 ++++++++
 .../http/netty4/Netty4HttpServerTransport.java        |  5 +----
 .../java/org/elasticsearch/http/HttpPreRequest.java   |  7 +++++--
 .../main/java/org/elasticsearch/rest/RestRequest.java | 11 +++++------
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpRequest.java b/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpRequest.java
index b04da46a2d7d7..74cc6268806f6 100644
--- a/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpRequest.java
+++ b/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpRequest.java
@@ -23,6 +23,7 @@
 
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.http.HttpBody;
+import org.elasticsearch.http.HttpPreRequest;
 import org.elasticsearch.http.HttpRequest;
 import org.elasticsearch.http.HttpResponse;
 import org.elasticsearch.rest.ChunkedRestResponseBodyPart;
@@ -48,6 +49,7 @@ public class Netty4HttpRequest implements HttpRequest {
     private final Exception inboundException;
     private final boolean pooled;
     private final int sequence;
+    private final String rawPath;
 
     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.rawPath = HttpPreRequest.extractPathFromUri(uri());
     }
 
     @Override
@@ -106,6 +109,11 @@ public String uri() {
         return request.uri();
     }
 
+    @Override
+    public String rawPath() {
+        return rawPath;
+    }
+
     @Override
     public HttpBody body() {
         assert released.get() == false;
diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpServerTransport.java b/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpServerTransport.java
index c6e7fa3517771..b7b59579529f3 100644
--- a/modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpServerTransport.java
+++ b/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()
diff --git a/server/src/main/java/org/elasticsearch/http/HttpPreRequest.java b/server/src/main/java/org/elasticsearch/http/HttpPreRequest.java
index d122d2c930aa8..5b1bb78691b86 100644
--- a/server/src/main/java/org/elasticsearch/http/HttpPreRequest.java
+++ b/server/src/main/java/org/elasticsearch/http/HttpPreRequest.java
@@ -36,8 +36,11 @@ public interface HttpPreRequest {
     /**
      * The uri without the query string.
      */
-    default String path() {
-        String uri = uri();
+    default String rawPath() {
+        return extractPathFromUri(uri());
+    }
+
+    static String extractPathFromUri(String uri) {
         final int index = uri.indexOf('?');
         if (index >= 0) {
             return uri.substring(0, index);
diff --git a/server/src/main/java/org/elasticsearch/rest/RestRequest.java b/server/src/main/java/org/elasticsearch/rest/RestRequest.java
index 3a67321c646a9..17eda305b5ccf 100644
--- a/server/src/main/java/org/elasticsearch/rest/RestRequest.java
+++ b/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 = httpRequest.path();
         return new RestRequest(
             parserConfig,
             params,
-            path,
+            httpRequest.rawPath(),
             httpRequest.getHeaders(),
             httpRequest,
             httpChannel,