Merge pull request #3038 in SNORT/snort3 from ~KATHARVE/snort3:http_infractions to...

Squashed commit of the following:

commit bee622927d4fcf9379b28024d0320ad694ac28ef
Author: Katura Harvey <katharve@cisco.com>
Date:   Tue Aug 24 15:00:32 2021 -0400

    http_inspect: hard-code infraction enum numbers

diff --git a/src/service_inspectors/http_inspect/http_enum.h b/src/service_inspectors/http_inspect/http_enum.h
index 5599b61521707046cb532850ad538ee538a3b75c..34a010cc8ba2d08bfb2d22bfcfa384ba6900e064 100755 (executable)
--- a/src/service_inspectors/http_inspect/http_enum.h
+++ b/src/service_inspectors/http_inspect/http_enum.h
@@ -146,136 +146,136 @@ enum Infraction
 {
     INF__NONE = -1,
     INF_BARE_BYTE = 0,
-    INF_HEAD_TOO_LONG,
-    INF_BAD_REQ_LINE,
-    INF_BAD_STAT_LINE,
-    INF_TOO_MANY_HEADERS,
-    INF_BAD_HEADER,
-    INF_BAD_STAT_CODE,
-    INF_UNKNOWN_VERSION,
-    INF_BAD_VERSION,
-    INF_ZERO_NINE_NOT_FIRST,
-    INF_CODE_POINT_IN_URI,
-    INF_BAD_CONTENT_LENGTH,
-    INF_PIPELINE_OVERFLOW,
-    INF_BAD_CHUNK_SIZE,
-    INF_BAD_PHRASE,
-    INF_BAD_URI,
-    INF_ZERO_NINE_REQ,
-    INF_ZERO_NINE_CONTINUE,
-    INF_URI_PERCENT_UTF8_3B,
-    INF_URI_PERCENT_UNRESERVED,
-    INF_URI_PERCENT_UTF8_2B,
-    INF_URI_NEED_NORM_SCHEME,
-    INF_URI_PERCENT_OTHER,
-    INF_URI_BAD_CHAR,
-    INF_URI_8BIT_CHAR,
-    INF_URI_MULTISLASH,
-    INF_BACKSLASH_IN_URI,
-    INF_URI_SLASH_DOT,
-    INF_URI_SLASH_DOT_DOT,
-    INF_URI_ROOT_TRAV,
-    INF_TOO_MUCH_LEADING_WS,
-    INF_WS_BETWEEN_MSGS,
-    INF_ENDLESS_HEADER,
-    INF_LF_WITHOUT_CR,
-    INF_NOT_HTTP,
-    INF_NO_URI,
-    INF_REQUEST_WS,
-    INF_REQUEST_TAB,
-    INF_STATUS_WS,
-    INF_STATUS_TAB,
-    INF_URI_SPACE,
-    INF_TOO_LONG_HEADER,
-    INF_CR_WITHOUT_LF,
-    INF_CHUNK_ZEROS,
-    INF_CHUNK_OPTIONS,
-    INF_CHUNK_BAD_CHAR,
-    INF_CHUNK_TOO_LARGE,
-    INF_CHUNK_BARE_LF,
-    INF_CHUNK_LONE_CR,
-    INF_CHUNK_NO_LENGTH,
-    INF_CHUNK_BAD_END,
-    INF_PARTIAL_START,
-    INF_CHUNK_WHITESPACE,
-    INF_HEAD_NAME_WHITESPACE,
-    INF_GZIP_OVERRUN,
-    INF_GZIP_FAILURE,
-    INF_GZIP_EARLY_END,
-    INF_URI_NEED_NORM_PATH,
-    INF_URI_NEED_NORM_HOST,
-    INF_URI_NEED_NORM_QUERY,
-    INF_URI_NEED_NORM_FRAGMENT,
-    INF_URI_U_ENCODE,
-    INF_URI_UNKNOWN_PERCENT,
-    INF_URI_DOUBLE_DECODE,
-    INF_MULTIPLE_CONTLEN,
-    INF_BOTH_CL_AND_TE,
-    INF_BAD_CODE_BODY_HEADER,
-    INF_BAD_TE_HEADER,
-    INF_PADDED_TE_HEADER,
-    INF_OVERSIZE_DIR,
-    INF_POST_WO_BODY,
-    INF_UTF_NORM_FAIL,
-    INF_UTF7,
-    INF_UNSUPPORTED_ENCODING,
-    INF_UNKNOWN_ENCODING,
-    INF_STACKED_ENCODINGS,
-    INF_JS_OBFUSCATION_EXCD,
-    INF_JS_EXCESS_WS,
-    INF_MIXED_ENCODINGS,
-    INF_RESPONSE_WO_REQUEST,
-    INF_SWF_ZLIB_FAILURE,
-    INF_SWF_LZMA_FAILURE,
-    INF_PDF_DEFL_FAILURE,
-    INF_PDF_UNSUP_COMP_TYPE,
-    INF_PDF_CASC_COMP,
-    INF_PDF_PARSE_FAILURE,
-    INF_FILE_DECOMPR_OVERRUN,
-    INF_BAD_CHAR_IN_HEADER_NAME,
-    INF_HEADER_WRAPPING,
-    INF_CHUNK_BAD_SEP,
-    INF_MULTIPLE_100_RESPONSES,
-    INF_UNEXPECTED_100_RESPONSE,
-    INF_UNKNOWN_1XX_STATUS,
-    INF_EXPECT_WITHOUT_BODY_CL0,
-    INF_EXPECT_WITHOUT_BODY_NO_CL,
-    INF_CHUNKED_ONE_POINT_ZERO,
-    INF_CTE_HEADER,
-    INF_ILLEGAL_TRAILER,
-    INF_REPEATED_HEADER,
-    INF_CONTENT_ENCODING_CHUNKED,
-    INF_206_WITHOUT_RANGE,
-    INF_VERSION_NOT_UPPERCASE,
-    INF_CHUNK_LEADING_WS,
-    INF_BAD_HEADER_WHITESPACE,
-    INF_H2_NON_IDENTITY_TE,
-    INF_H2_DATA_OVERRUNS_CL,
-    INF_H2_DATA_UNDERRUNS_CL,
-    INF_CONNECT_REQUEST_BODY,
-    INF_EARLY_C2S_TRAFFIC_AFTER_CONNECT,
-    INF_200_CONNECT_RESP_WITH_CL,
-    INF_200_CONNECT_RESP_WITH_TE,
-    INF_100_CONNECT_RESP,
-    INF_EARLY_CONNECT_RESPONSE,
-    INF_MALFORMED_CD_FILENAME,
-    INF_HTTP2_IN_HI,
-    INF_TRUNCATED_MSG_BODY_CL,
-    INF_TRUNCATED_MSG_BODY_CHUNK,
-    INF_LONG_SCHEME,
-    INF_MULTIPLE_HOST_HDRS,
-    INF_HTTP2_SETTINGS,
-    INF_UPGRADE_HEADER_HTTP2,
-    INF_JS_BAD_TOKEN,
-    INF_JS_OPENING_TAG,
-    INF_JS_CLOSING_TAG,
-    INF_JS_CODE_IN_EXTERNAL,
-    INF_JS_SHORTENED_TAG,
-    INF_JS_IDENTIFIER_OVERFLOW,
-    INF_JS_TMPL_NEST_OVFLOW,
-    INF_CHUNK_OVER_MAXIMUM,
-    INF_LONG_HOST_VALUE,
-    INF_ACCEPT_ENCODING_CONSECUTIVE_COMMAS,
+    INF_HEAD_TOO_LONG = 1,
+    INF_BAD_REQ_LINE = 2,
+    INF_BAD_STAT_LINE = 3,
+    INF_TOO_MANY_HEADERS = 4,
+    INF_BAD_HEADER = 5,
+    INF_BAD_STAT_CODE = 6,
+    INF_UNKNOWN_VERSION = 7,
+    INF_BAD_VERSION = 8,
+    INF_ZERO_NINE_NOT_FIRST = 9,
+    INF_CODE_POINT_IN_URI = 10,
+    INF_BAD_CONTENT_LENGTH = 11,
+    INF_PIPELINE_OVERFLOW = 12,
+    INF_BAD_CHUNK_SIZE = 13,
+    INF_BAD_PHRASE = 14,
+    INF_BAD_URI = 15,
+    INF_ZERO_NINE_REQ = 16,
+    INF_ZERO_NINE_CONTINUE = 17,
+    INF_URI_PERCENT_UTF8_3B = 18,
+    INF_URI_PERCENT_UNRESERVED = 19,
+    INF_URI_PERCENT_UTF8_2B = 20,
+    INF_URI_NEED_NORM_SCHEME = 21,
+    INF_URI_PERCENT_OTHER = 22,
+    INF_URI_BAD_CHAR = 23,
+    INF_URI_8BIT_CHAR = 24,
+    INF_URI_MULTISLASH = 25,
+    INF_BACKSLASH_IN_URI = 26,
+    INF_URI_SLASH_DOT = 27,
+    INF_URI_SLASH_DOT_DOT = 28,
+    INF_URI_ROOT_TRAV = 29,
+    INF_TOO_MUCH_LEADING_WS = 30,
+    INF_WS_BETWEEN_MSGS = 31,
+    INF_ENDLESS_HEADER = 32,
+    INF_LF_WITHOUT_CR = 33,
+    INF_NOT_HTTP = 34,
+    INF_NO_URI = 35,
+    INF_REQUEST_WS = 36,
+    INF_REQUEST_TAB = 37,
+    INF_STATUS_WS = 38,
+    INF_STATUS_TAB = 39,
+    INF_URI_SPACE = 40,
+    INF_TOO_LONG_HEADER = 41,
+    INF_CR_WITHOUT_LF = 42,
+    INF_CHUNK_ZEROS = 43,
+    INF_CHUNK_OPTIONS = 44,
+    INF_CHUNK_BAD_CHAR = 45,
+    INF_CHUNK_TOO_LARGE = 46,
+    INF_CHUNK_BARE_LF = 47,
+    INF_CHUNK_LONE_CR = 48,
+    INF_CHUNK_NO_LENGTH = 49,
+    INF_CHUNK_BAD_END = 50,
+    INF_PARTIAL_START = 51,
+    INF_CHUNK_WHITESPACE = 52,
+    INF_HEAD_NAME_WHITESPACE = 53,
+    INF_GZIP_OVERRUN = 54,
+    INF_GZIP_FAILURE = 55,
+    INF_GZIP_EARLY_END = 56,
+    INF_URI_NEED_NORM_PATH = 57,
+    INF_URI_NEED_NORM_HOST = 58,
+    INF_URI_NEED_NORM_QUERY = 59,
+    INF_URI_NEED_NORM_FRAGMENT = 60,
+    INF_URI_U_ENCODE = 61,
+    INF_URI_UNKNOWN_PERCENT = 62,
+    INF_URI_DOUBLE_DECODE = 63,
+    INF_MULTIPLE_CONTLEN = 64,
+    INF_BOTH_CL_AND_TE = 65,
+    INF_BAD_CODE_BODY_HEADER = 66,
+    INF_BAD_TE_HEADER = 67,
+    INF_PADDED_TE_HEADER = 68,
+    INF_OVERSIZE_DIR = 69,
+    INF_POST_WO_BODY = 70,
+    INF_UTF_NORM_FAIL = 71,
+    INF_UTF7 = 72,
+    INF_UNSUPPORTED_ENCODING = 73,
+    INF_UNKNOWN_ENCODING = 74,
+    INF_STACKED_ENCODINGS = 75,
+    INF_JS_OBFUSCATION_EXCD = 76,
+    INF_JS_EXCESS_WS = 77,
+    INF_MIXED_ENCODINGS = 78,
+    INF_RESPONSE_WO_REQUEST = 79,
+    INF_SWF_ZLIB_FAILURE = 80,
+    INF_SWF_LZMA_FAILURE = 81,
+    INF_PDF_DEFL_FAILURE = 82,
+    INF_PDF_UNSUP_COMP_TYPE = 83,
+    INF_PDF_CASC_COMP = 84,
+    INF_PDF_PARSE_FAILURE = 85,
+    INF_FILE_DECOMPR_OVERRUN = 86,
+    INF_BAD_CHAR_IN_HEADER_NAME = 87,
+    INF_HEADER_WRAPPING = 88,
+    INF_CHUNK_BAD_SEP = 89,
+    INF_MULTIPLE_100_RESPONSES = 90,
+    INF_UNEXPECTED_100_RESPONSE = 91,
+    INF_UNKNOWN_1XX_STATUS = 92,
+    INF_EXPECT_WITHOUT_BODY_CL0 = 93,
+    INF_EXPECT_WITHOUT_BODY_NO_CL = 94,
+    INF_CHUNKED_ONE_POINT_ZERO = 95,
+    INF_CTE_HEADER = 96,
+    INF_ILLEGAL_TRAILER = 97,
+    INF_REPEATED_HEADER = 98,
+    INF_CONTENT_ENCODING_CHUNKED = 99,
+    INF_206_WITHOUT_RANGE = 100,
+    INF_VERSION_NOT_UPPERCASE = 101,
+    INF_CHUNK_LEADING_WS = 102,
+    INF_BAD_HEADER_WHITESPACE = 103,
+    INF_H2_NON_IDENTITY_TE = 104,
+    INF_H2_DATA_OVERRUNS_CL = 105,
+    INF_H2_DATA_UNDERRUNS_CL = 106,
+    INF_CONNECT_REQUEST_BODY = 107,
+    INF_EARLY_C2S_TRAFFIC_AFTER_CONNECT = 108,
+    INF_200_CONNECT_RESP_WITH_CL = 109,
+    INF_200_CONNECT_RESP_WITH_TE = 110,
+    INF_100_CONNECT_RESP = 111,
+    INF_EARLY_CONNECT_RESPONSE = 112,
+    INF_MALFORMED_CD_FILENAME = 113,
+    INF_HTTP2_IN_HI = 114,
+    INF_TRUNCATED_MSG_BODY_CL = 115,
+    INF_TRUNCATED_MSG_BODY_CHUNK = 116,
+    INF_LONG_SCHEME = 117,
+    INF_MULTIPLE_HOST_HDRS = 118,
+    INF_HTTP2_SETTINGS = 119,
+    INF_UPGRADE_HEADER_HTTP2 = 120,
+    INF_JS_BAD_TOKEN = 121,
+    INF_JS_OPENING_TAG = 122,
+    INF_JS_CLOSING_TAG = 123,
+    INF_JS_CODE_IN_EXTERNAL = 124,
+    INF_JS_SHORTENED_TAG = 125,
+    INF_JS_IDENTIFIER_OVERFLOW = 126,
+    INF_JS_TMPL_NEST_OVFLOW = 127,
+    INF_CHUNK_OVER_MAXIMUM = 128,
+    INF_LONG_HOST_VALUE = 129,
+    INF_ACCEPT_ENCODING_CONSECUTIVE_COMMAS = 130,
     INF__MAX_VALUE
 };