From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Mon, 14 Oct 2019 14:55:33 +0000 (-0400)
Subject: Merge pull request #1792 in SNORT/snort3 from ~DERAMADA/snort3:h2i_abort_bad_preface... 
X-Git-Tag: 3.0.0-263~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b94660826629a94f2489b2ac492837dbad39886f;p=thirdparty%2Fsnort3.git

Merge pull request #1792 in SNORT/snort3 from ~DERAMADA/snort3:h2i_abort_bad_preface to master

Squashed commit of the following:

commit fbb4311a964018530e8880d0b5080be3238ae2cf
Author: deramada <deramada@cisco.com>
Date:   Wed Oct 9 13:39:12 2019 -0400

    http2_inspect: Abort on bad connection preface
---

diff --git a/src/service_inspectors/http2_inspect/http2_stream_splitter_impl.cc b/src/service_inspectors/http2_inspect/http2_stream_splitter_impl.cc
index eae9fcb60..cca653eba 100644
--- a/src/service_inspectors/http2_inspect/http2_stream_splitter_impl.cc
+++ b/src/service_inspectors/http2_inspect/http2_stream_splitter_impl.cc
@@ -88,10 +88,7 @@ StreamSplitter::Status implement_scan(Http2FlowData* session_data, const uint8_t
                 break;
             case V_BAD:
                 session_data->events[source_id]->create_event(EVENT_PREFACE_MATCH_FAILURE);
-                // FIXIT-H: Workaround till abort is implemented
-                if((session_data->octets_seen[source_id] + length) >= 24)
-                    break;
-                // Falls through
+                return StreamSplitter::ABORT;
             case V_TBD:
                 session_data->octets_seen[source_id] += length;
                 return StreamSplitter::SEARCH;