Add local_end_stream_ to crash dump for H1 (envoyproxy#17367)

Risk Level: low Testing: unit test improvements Docs Changes: n/a Release Notes: n/a Signed-off-by: Pradeep Rao <[email protected]>
leyao-daily · Sep 30, 2021 · d50d575 · d50d575
1 parent 2ae0185
commit d50d575
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/source/common/http/http1/codec_impl.cc b/source/common/http/http1/codec_impl.cc
@@ -899,11 +899,8 @@ void ConnectionImpl::dumpState(std::ostream& os, int indent_level) const {
 
 void ServerConnectionImpl::dumpAdditionalState(std::ostream& os, int indent_level) const {
   const char* spaces = spacesForLevel(indent_level);
-  os << DUMP_MEMBER_AS(active_request_.request_url_,
-                       active_request_.has_value() &&
-                               !active_request_.value().request_url_.getStringView().empty()
-                           ? active_request_.value().request_url_.getStringView()
-                           : "null");
+
+  DUMP_DETAILS(active_request_);
   os << '\n';
 
   // Dump header map, it may be null if it was moved to the request, and
@@ -1228,6 +1225,13 @@ Status ServerConnectionImpl::checkHeaderNameForUnderscores() {
   return okStatus();
 }
 
+void ServerConnectionImpl::ActiveRequest::dumpState(std::ostream& os, int indent_level) const {
+  (void)indent_level;
+  os << DUMP_MEMBER_AS(
+      request_url_, !request_url_.getStringView().empty() ? request_url_.getStringView() : "null");
+  os << DUMP_MEMBER(response_encoder_.local_end_stream_);
+}
+
 ClientConnectionImpl::ClientConnectionImpl(Network::Connection& connection, CodecStats& stats,
                                            ConnectionCallbacks&, const Http1Settings& settings,
                                            const uint32_t max_response_headers_count)

diff --git a/source/common/http/http1/codec_impl.h b/source/common/http/http1/codec_impl.h
@@ -440,6 +440,7 @@ class ServerConnectionImpl : public ServerConnection, public ConnectionImpl {
         : response_encoder_(connection,
                             connection.codec_settings_.stream_error_on_invalid_http_message_) {}
 
+    void dumpState(std::ostream& os, int indent_level) const;
     HeaderString request_url_;
     RequestDecoder* request_decoder_{};
     ResponseEncoderImpl response_encoder_;

diff --git a/test/common/http/http1/codec_impl_test.cc b/test/common/http/http1/codec_impl_test.cc
@@ -2159,7 +2159,8 @@ TEST_F(Http1ServerConnectionImplTest, ShouldDumpDispatchBufferWithoutAllocatingM
   // Check dump contents
   EXPECT_THAT(ostream.contents(), HasSubstr("buffered_body_.length(): 5, header_parsing_state_: "
                                             "Done, current_header_field_: , current_header_value_: "
-                                            "\n, active_request_.request_url_: null"));
+                                            "\nactive_request_: \n, request_url_: null"
+                                            ", response_encoder_.local_end_stream_: 0"));
   EXPECT_THAT(ostream.contents(),
               HasSubstr("current_dispatching_buffer_ front_slice length: 43 contents: \"POST / "
                         "HTTP/1.1\\r\\nContent-Length: 5\\r\\n\\r\\nHello\"\n"));