connect_grpc_bridge: remove request content-length (envoyproxy#30363)

We need to always remove Content-Length since the request on the other side of the filter is chunked with a different body size. Signed-off-by: Martin Conte Mac Donell <[email protected]>
daixiang0 · Oct 21, 2023 · c18432e · c18432e
1 parent a98cafb
commit c18432e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/source/extensions/filters/http/connect_grpc_bridge/filter.cc b/source/extensions/filters/http/connect_grpc_bridge/filter.cc
@@ -290,8 +290,9 @@ Http::FilterHeadersStatus ConnectGrpcBridgeFilter::decodeHeaders(Http::RequestHe
       unary_payload_frame_flags_ |= Envoy::Grpc::GRPC_FH_COMPRESSED;
     }
 
+    headers.removeContentLength();
+
     if (end_stream) {
-      headers.removeContentLength();
       Grpc::Encoder().prependFrameHeader(unary_payload_frame_flags_, request_buffer_);
       decoder_callbacks_->addDecodedData(request_buffer_, true);
     }

diff --git a/test/extensions/filters/http/connect_grpc_bridge/connect_grpc_bridge_filter_test.cc b/test/extensions/filters/http/connect_grpc_bridge/connect_grpc_bridge_filter_test.cc
@@ -450,6 +450,14 @@ TEST_F(ConnectGrpcBridgeFilterTest, UnaryRequestWithNoBodyNorTrailers) {
   EXPECT_EQ(Http::FilterHeadersStatus::Continue, filter_.decodeHeaders(request_headers_, true));
 }
 
+TEST_F(ConnectGrpcBridgeFilterTest, UnaryRequestRemovesContentLength) {
+  request_headers_.setCopy(Http::CustomHeaders::get().ConnectProtocolVersion, "1");
+  request_headers_.setContentType(Http::Headers::get().ContentTypeValues.Grpc);
+  request_headers_.setContentLength(1337);
+  EXPECT_EQ(Http::FilterHeadersStatus::Continue, filter_.decodeHeaders(request_headers_, false));
+  EXPECT_EQ("", request_headers_.get_("content-length"));
+}
+
 TEST_F(ConnectGrpcBridgeFilterTest, StreamingSupportedContentType) {
   request_headers_.setContentType("application/connect+proto");
   EXPECT_EQ(Http::FilterHeadersStatus::Continue, filter_.decodeHeaders(request_headers_, false));