Pull request #3503: http_inspect: do not abort midstream pickups

Merge in SNORT/snort3 from ~ADMAMOLE/snort3:midstream_pickup to master

Squashed commit of the following:

commit bc82cbb5677d46a254251022c7aebf01625a05c9
Author: Adrian Mamolea <admamole@cisco.com>
Date:   Fri Jul 1 15:36:43 2022 -0400

    http_inspect: do not abort midstream pickups

diff --git a/src/service_inspectors/http2_inspect/http2_stream_splitter.cc b/src/service_inspectors/http2_inspect/http2_stream_splitter.cc
index 588e412c6e3228b1c93d4cc652d8ac6799780531..41bae3d32e81209fee570eb95cefbb1ae036c548 100644 (file)
--- a/src/service_inspectors/http2_inspect/http2_stream_splitter.cc
+++ b/src/service_inspectors/http2_inspect/http2_stream_splitter.cc
@@ -46,8 +46,6 @@ StreamSplitter::Status Http2StreamSplitter::scan(Packet* pkt, const uint8_t* dat
     Profile profile(Http2Module::get_profile_stats());
 
     Flow* const flow = pkt->flow;
-    if (flow->session_state & STREAM_STATE_MIDSTREAM)
-        return StreamSplitter::ABORT;
 
     // This is the session state information we share with Http2Inspect and store with stream. A
     // session is defined by a TCP connection. Since scan() is the first to see a new TCP

diff --git a/src/service_inspectors/http_inspect/http_stream_splitter_scan.cc b/src/service_inspectors/http_inspect/http_stream_splitter_scan.cc
index 549164dd361698313be85fd98a5f40a6ed53b4f6..3209cfaed80bb98799cb2a0b0911384d0a98d582 100644 (file)
--- a/src/service_inspectors/http_inspect/http_stream_splitter_scan.cc
+++ b/src/service_inspectors/http_inspect/http_stream_splitter_scan.cc
@@ -131,8 +131,6 @@ StreamSplitter::Status HttpStreamSplitter::scan(Packet* pkt, const uint8_t* data
     Profile profile(HttpModule::get_profile_stats());
 
     Flow* const flow = pkt->flow;
-    if (flow->session_state & STREAM_STATE_MIDSTREAM)
-        return StreamSplitter::ABORT;
 
     // This is the session state information we share with HttpInspect and store with stream. A
     // session is defined by a TCP connection. Since scan() is the first to see a new TCP