Skip to content

Commit e40775d

Browse files
catenacybervictorjulien
catenacyber
authored and
victorjulien
committed
detect/http2: fix progress for headers
Ticket: 8451 Do not wait to see a data frame to run detection on http2 headers (cherry picked from commit 40c8620)
1 parent b80d5f7 commit e40775d

11 files changed

Lines changed: 26 additions & 26 deletions

‎src/detect-http-cookie.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@ void DetectHttpCookieRegister(void)
120120
GetResponseData, ALPROTO_HTTP1, HTP_REQUEST_PROGRESS_HEADERS);
121121

122122
DetectAppLayerInspectEngineRegister("http_cookie", ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
123-
HTTP2StateDataClient, DetectEngineInspectBufferGeneric, GetRequestData2);
123+
HTTP2StateOpen, DetectEngineInspectBufferGeneric, GetRequestData2);
124124
DetectAppLayerInspectEngineRegister("http_cookie", ALPROTO_HTTP2, SIG_FLAG_TOCLIENT,
125125
HTTP2StateDataServer, DetectEngineInspectBufferGeneric, GetResponseData2);
126126

127127
DetectAppLayerMpmRegister("http_cookie", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
128-
GetRequestData2, ALPROTO_HTTP2, HTTP2StateDataClient);
128+
GetRequestData2, ALPROTO_HTTP2, HTTP2StateOpen);
129129
DetectAppLayerMpmRegister("http_cookie", SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
130130
GetResponseData2, ALPROTO_HTTP2, HTTP2StateDataServer);
131131

‎src/detect-http-header-names.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,12 +236,12 @@ void DetectHttpHeaderNamesRegister(void)
236236

237237
/* http2 */
238238
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
239-
GetBuffer2ForTX, ALPROTO_HTTP2, HTTP2StateDataClient);
239+
GetBuffer2ForTX, ALPROTO_HTTP2, HTTP2StateOpen);
240240
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
241241
GetBuffer2ForTX, ALPROTO_HTTP2, HTTP2StateDataServer);
242242

243243
DetectAppLayerInspectEngineRegister(BUFFER_NAME, ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
244-
HTTP2StateDataClient, DetectEngineInspectBufferGeneric, GetBuffer2ForTX);
244+
HTTP2StateOpen, DetectEngineInspectBufferGeneric, GetBuffer2ForTX);
245245
DetectAppLayerInspectEngineRegister(BUFFER_NAME, ALPROTO_HTTP2, SIG_FLAG_TOCLIENT,
246246
HTTP2StateDataServer, DetectEngineInspectBufferGeneric, GetBuffer2ForTX);
247247

‎src/detect-http-header.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,9 +441,9 @@ void DetectHttpHeaderRegister(void)
441441
0); /* not used, registered twice: HEADERS/TRAILER */
442442

443443
DetectAppLayerInspectEngineRegister("http_header", ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
444-
HTTP2StateDataClient, DetectEngineInspectBufferGeneric, GetBuffer2ForTX);
444+
HTTP2StateOpen, DetectEngineInspectBufferGeneric, GetBuffer2ForTX);
445445
DetectAppLayerMpmRegister("http_header", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
446-
GetBuffer2ForTX, ALPROTO_HTTP2, HTTP2StateDataClient);
446+
GetBuffer2ForTX, ALPROTO_HTTP2, HTTP2StateOpen);
447447

448448
DetectAppLayerInspectEngineRegister("http_header", ALPROTO_HTTP2, SIG_FLAG_TOCLIENT,
449449
HTTP2StateDataServer, DetectEngineInspectBufferGeneric, GetBuffer2ForTX);

‎src/detect-http-headers-stub.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ static void DetectHttpHeadersRegisterStub(void)
198198
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
199199
GetRequestData, ALPROTO_HTTP1, HTP_REQUEST_PROGRESS_HEADERS);
200200
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
201-
GetRequestData2, ALPROTO_HTTP2, HTTP2StateDataClient);
201+
GetRequestData2, ALPROTO_HTTP2, HTTP2StateOpen);
202202
#endif
203203
#ifdef KEYWORD_TOCLIENT
204204
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
@@ -210,7 +210,7 @@ static void DetectHttpHeadersRegisterStub(void)
210210
DetectAppLayerInspectEngineRegister(BUFFER_NAME, ALPROTO_HTTP1, SIG_FLAG_TOSERVER,
211211
HTP_REQUEST_PROGRESS_HEADERS, DetectEngineInspectBufferGeneric, GetRequestData);
212212
DetectAppLayerInspectEngineRegister(BUFFER_NAME, ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
213-
HTTP2StateDataClient, DetectEngineInspectBufferGeneric, GetRequestData2);
213+
HTTP2StateOpen, DetectEngineInspectBufferGeneric, GetRequestData2);
214214
#endif
215215
#ifdef KEYWORD_TOCLIENT
216216
DetectAppLayerInspectEngineRegister(BUFFER_NAME, ALPROTO_HTTP1, SIG_FLAG_TOCLIENT,

‎src/detect-http-host.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,10 @@ void DetectHttpHHRegister(void)
117117
GetData, ALPROTO_HTTP1, HTP_REQUEST_PROGRESS_HEADERS);
118118

119119
DetectAppLayerInspectEngineRegister("http_host", ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
120-
HTTP2StateDataClient, DetectEngineInspectBufferGeneric, GetData2);
120+
HTTP2StateOpen, DetectEngineInspectBufferGeneric, GetData2);
121121

122122
DetectAppLayerMpmRegister("http_host", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
123-
GetData2, ALPROTO_HTTP2, HTTP2StateDataClient);
123+
GetData2, ALPROTO_HTTP2, HTTP2StateOpen);
124124

125125
DetectBufferTypeRegisterValidateCallback("http_host",
126126
DetectHttpHostValidateCallback);
@@ -157,10 +157,10 @@ void DetectHttpHHRegister(void)
157157
GetRawData, ALPROTO_HTTP1, HTP_REQUEST_PROGRESS_HEADERS);
158158

159159
DetectAppLayerInspectEngineRegister("http_raw_host", ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
160-
HTTP2StateDataClient, DetectEngineInspectBufferGeneric, GetRawData2);
160+
HTTP2StateOpen, DetectEngineInspectBufferGeneric, GetRawData2);
161161

162162
DetectAppLayerMpmRegister("http_raw_host", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
163-
GetRawData2, ALPROTO_HTTP2, HTTP2StateDataClient);
163+
GetRawData2, ALPROTO_HTTP2, HTTP2StateOpen);
164164

165165
DetectBufferTypeSetDescriptionByName("http_raw_host",
166166
"http raw host header");

‎src/detect-http-method.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ void DetectHttpMethodRegister(void)
107107
GetData, ALPROTO_HTTP1, HTP_REQUEST_PROGRESS_LINE);
108108

109109
DetectAppLayerInspectEngineRegister("http_method", ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
110-
HTTP2StateDataClient, DetectEngineInspectBufferGeneric, GetData2);
110+
HTTP2StateOpen, DetectEngineInspectBufferGeneric, GetData2);
111111

112112
DetectAppLayerMpmRegister("http_method", SIG_FLAG_TOSERVER, 4, PrefilterGenericMpmRegister,
113-
GetData2, ALPROTO_HTTP2, HTTP2StateDataClient);
113+
GetData2, ALPROTO_HTTP2, HTTP2StateOpen);
114114

115115
DetectBufferTypeSetDescriptionByName("http_method",
116116
"http request method");

‎src/detect-http-protocol.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ void DetectHttpProtocolRegister(void)
173173
HTP_RESPONSE_PROGRESS_LINE, DetectEngineInspectBufferGeneric, GetData);
174174

175175
DetectAppLayerInspectEngineRegister(BUFFER_NAME, ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
176-
HTTP2StateDataClient, DetectEngineInspectBufferGeneric, GetData2);
176+
HTTP2StateOpen, DetectEngineInspectBufferGeneric, GetData2);
177177
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
178-
GetData2, ALPROTO_HTTP2, HTTP2StateDataClient);
178+
GetData2, ALPROTO_HTTP2, HTTP2StateOpen);
179179
DetectAppLayerInspectEngineRegister(BUFFER_NAME, ALPROTO_HTTP2, SIG_FLAG_TOCLIENT,
180180
HTTP2StateDataServer, DetectEngineInspectBufferGeneric, GetData2);
181181
DetectAppLayerMpmRegister(BUFFER_NAME, SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,

‎src/detect-http-raw-header.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@ void DetectHttpRawHeaderRegister(void)
115115
0); /* progress handled in register */
116116

117117
DetectAppLayerInspectEngineRegister("http_raw_header", ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
118-
HTTP2StateDataClient, DetectEngineInspectBufferGeneric, GetData2);
118+
HTTP2StateOpen, DetectEngineInspectBufferGeneric, GetData2);
119119
DetectAppLayerInspectEngineRegister("http_raw_header", ALPROTO_HTTP2, SIG_FLAG_TOCLIENT,
120120
HTTP2StateDataServer, DetectEngineInspectBufferGeneric, GetData2);
121121

122122
DetectAppLayerMpmRegister("http_raw_header", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
123-
GetData2, ALPROTO_HTTP2, HTTP2StateDataClient);
123+
GetData2, ALPROTO_HTTP2, HTTP2StateOpen);
124124
DetectAppLayerMpmRegister("http_raw_header", SIG_FLAG_TOCLIENT, 2, PrefilterGenericMpmRegister,
125125
GetData2, ALPROTO_HTTP2, HTTP2StateDataServer);
126126

‎src/detect-http-request-line.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ void DetectHttpRequestLineRegister(void)
117117
PrefilterGenericMpmRegister, GetData, ALPROTO_HTTP1, HTP_REQUEST_PROGRESS_LINE);
118118

119119
DetectAppLayerInspectEngineRegister("http_request_line", ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
120-
HTTP2StateDataClient, DetectEngineInspectBufferGeneric, GetData2);
120+
HTTP2StateOpen, DetectEngineInspectBufferGeneric, GetData2);
121121
DetectAppLayerMpmRegister("http_request_line", SIG_FLAG_TOSERVER, 2,
122-
PrefilterGenericMpmRegister, GetData2, ALPROTO_HTTP2, HTTP2StateDataClient);
122+
PrefilterGenericMpmRegister, GetData2, ALPROTO_HTTP2, HTTP2StateOpen);
123123

124124
DetectBufferTypeSetDescriptionByName("http_request_line",
125125
"http request line");

‎src/detect-http-ua.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ void DetectHttpUARegister(void)
108108
GetData, ALPROTO_HTTP1, HTP_REQUEST_PROGRESS_HEADERS);
109109

110110
DetectAppLayerInspectEngineRegister("http_user_agent", ALPROTO_HTTP2, SIG_FLAG_TOSERVER,
111-
HTTP2StateDataClient, DetectEngineInspectBufferGeneric, GetData2);
111+
HTTP2StateOpen, DetectEngineInspectBufferGeneric, GetData2);
112112

113113
DetectAppLayerMpmRegister("http_user_agent", SIG_FLAG_TOSERVER, 2, PrefilterGenericMpmRegister,
114-
GetData2, ALPROTO_HTTP2, HTTP2StateDataClient);
114+
GetData2, ALPROTO_HTTP2, HTTP2StateOpen);
115115

116116
DetectBufferTypeSetDescriptionByName("http_user_agent",
117117
"http user agent");

0 commit comments

Comments
 (0)