commit 4c57abcfa6c2ed3516c006725bf4d3937239bbd0
author QUICHE team <quiche-dev@google.com> Thu Oct 14 08:35:45 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Oct 14 08:37:03 2021 -0700
tree d160e14ee4e81dfac7a7075c6499a1eb717a50c3
parent 6752471dfba7058133af857e76a1dcea8b074401

Stop decoder processing on connection error in OgHttp2Session.

Based on a comment in cl/401338105, this CL changes
OgHttp2Session::LatchErrorAndNotify() to also call decoder_.StopProcessing().

Because decoder_.StopProcessing() itself eventually leads back to
OgHttp2Session::LatchErrorAndNotify(), this CL also prevents
LatchErrorAndNotify() from taking action when it has already been called,
avoiding multiple visitor_.OnConnectionError() calls.
PiperOrigin-RevId: 403101766

http2/adapter/oghttp2_adapter_test.cc

diff --git a/http2/adapter/oghttp2_adapter_test.cc b/http2/adapter/oghttp2_adapter_test.cc
index 8070994..48baba1 100644
--- a/http2/adapter/oghttp2_adapter_test.cc
+++ b/http2/adapter/oghttp2_adapter_test.cc
@@ -444,11 +444,6 @@
       .WillOnce(
           testing::Return(Http2VisitorInterface::HEADER_CONNECTION_ERROR));
   EXPECT_CALL(visitor, OnConnectionError(ConnectionError::kHeaderError));
-  // Note: OgHttp2Adapter continues processing bytes until the input is
-  // complete.
-  EXPECT_CALL(visitor, OnFrameHeader(1, _, DATA, 0));
-  EXPECT_CALL(visitor, OnBeginDataForStream(1, _));
-  EXPECT_CALL(visitor, OnDataForStream(1, "This is the response body."));
 
   const int64_t stream_result = adapter->ProcessBytes(stream_frames);
   EXPECT_LT(stream_result, 0);
@@ -516,11 +511,6 @@
       .WillOnce(testing::Return(false));
   // Rejecting headers leads to a connection error.
   EXPECT_CALL(visitor, OnConnectionError(ConnectionError::kHeaderError));
-  // Note: OgHttp2Adapter continues processing bytes until the input is
-  // complete.
-  EXPECT_CALL(visitor, OnFrameHeader(1, _, DATA, 0));
-  EXPECT_CALL(visitor, OnBeginDataForStream(1, _));
-  EXPECT_CALL(visitor, OnDataForStream(1, "This is the response body."));
 
   const int64_t stream_result = adapter->ProcessBytes(stream_frames);
   EXPECT_LT(stream_result, 0);

http2/adapter/oghttp2_session.cc

diff --git a/http2/adapter/oghttp2_session.cc b/http2/adapter/oghttp2_session.cc
index 607cda4..2784bef 100644
--- a/http2/adapter/oghttp2_session.cc
+++ b/http2/adapter/oghttp2_session.cc
@@ -1039,8 +1039,14 @@
 }
 
 void OgHttp2Session::LatchErrorAndNotify(ConnectionError error) {
+  if (latched_error_) {
+    // Do not kick a connection when it is down.
+    return;
+  }
+
   latched_error_ = true;
   visitor_.OnConnectionError(error);
+  decoder_.StopProcessing();
 }
 
 }  // namespace adapter