aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

http: fix reassembled range file accounting

Browse Source
pull/7186/head
Victor Julien 4 years ago
parent 6d30f4442c
commit 9537d119b9
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File

7
src/app-layer-htp-file.c
Unescape Escape View File

@ -390,7 +390,7 @@ bool HTPFileCloseHandleRange(FileContainer *files, const uint16_t flags, HttpRan
* \retval -1 error * \retval -1 error
* \retval -2 not storing files on this flow/tx * \retval -2 not storing files on this flow/tx
*/ */
int HTPFileClose(HtpState *s, const uint8_t *data, uint32_t data_len, int HTPFileClose(HtpState *s, HtpTxUserData *htud, const uint8_t *data, uint32_t data_len,
uint8_t flags, uint8_t direction) uint8_t flags, uint8_t direction)
{ {
SCEnter(); SCEnter();
@ -422,7 +422,10 @@ int HTPFileClose(HtpState *s, const uint8_t *data, uint32_t data_len,
} }
if (s->file_range != NULL) { if (s->file_range != NULL) {
HTPFileCloseHandleRange(files, flags, s->file_range, data, data_len); bool added = HTPFileCloseHandleRange(files, flags, s->file_range, data, data_len);
if (added) {
htud->tx_data.files_opened++;
}
HttpRangeFreeBlock(s->file_range); HttpRangeFreeBlock(s->file_range);
s->file_range = NULL; s->file_range = NULL;
} }

2
src/app-layer-htp-file.h
Unescape Escape View File

@ -33,7 +33,7 @@ int HTPFileOpenWithRange(HtpState *, HtpTxUserData *, const uint8_t *, uint16_t,
bool HTPFileCloseHandleRange( bool HTPFileCloseHandleRange(
FileContainer *, const uint16_t, HttpRangeContainerBlock *, const uint8_t *, uint32_t); FileContainer *, const uint16_t, HttpRangeContainerBlock *, const uint8_t *, uint32_t);
int HTPFileStoreChunk(HtpState *, const uint8_t *, uint32_t, uint8_t); int HTPFileStoreChunk(HtpState *, const uint8_t *, uint32_t, uint8_t);
int HTPFileClose(HtpState *, const uint8_t *, uint32_t, uint8_t, uint8_t); int HTPFileClose(HtpState *, HtpTxUserData *, const uint8_t *, uint32_t, uint8_t, uint8_t);
void HTPFileParserRegisterTests(void); void HTPFileParserRegisterTests(void);

17
src/app-layer-htp.c
Unescape Escape View File

@ -1414,9 +1414,8 @@ static int HtpRequestBodyHandleMultipart(HtpState *hstate, HtpTxUserData *htud,
printf("FILEDATA (final chunk) END: \n"); printf("FILEDATA (final chunk) END: \n");
#endif #endif
if (!(htud->tsflags & HTP_DONTSTORE)) { if (!(htud->tsflags & HTP_DONTSTORE)) {
if (HTPFileClose(hstate, filedata, filedata_len, flags, if (HTPFileClose(hstate, htud, filedata, filedata_len, flags, STREAM_TOSERVER) ==
STREAM_TOSERVER) == -1) -1) {
{
goto end; goto end;
} }
} }
@ -1538,7 +1537,7 @@ static int HtpRequestBodyHandleMultipart(HtpState *hstate, HtpTxUserData *htud,
} else if (result == -2) { } else if (result == -2) {
htud->tsflags |= HTP_DONTSTORE; htud->tsflags |= HTP_DONTSTORE;
} else { } else {
if (HTPFileClose(hstate, NULL, 0, 0, STREAM_TOSERVER) == -1) { if (HTPFileClose(hstate, htud, NULL, 0, 0, STREAM_TOSERVER) == -1) {
goto end; goto end;
} }
} }
@ -1605,7 +1604,7 @@ static int HtpRequestBodyHandleMultipart(HtpState *hstate, HtpTxUserData *htud,
} else if (result == -2) { } else if (result == -2) {
htud->tsflags |= HTP_DONTSTORE; htud->tsflags |= HTP_DONTSTORE;
} else { } else {
if (HTPFileClose(hstate, NULL, 0, 0, STREAM_TOSERVER) == -1) { if (HTPFileClose(hstate, htud, NULL, 0, 0, STREAM_TOSERVER) == -1) {
goto end; goto end;
} }
} }
@ -1891,7 +1890,7 @@ static int HTPCallbackRequestBodyData(htp_tx_data_t *d)
} else { } else {
if (tx_ud->tsflags & HTP_FILENAME_SET) { if (tx_ud->tsflags & HTP_FILENAME_SET) {
SCLogDebug("closing file that was being stored"); SCLogDebug("closing file that was being stored");
(void)HTPFileClose(hstate, NULL, 0, FILE_TRUNCATED, STREAM_TOSERVER); (void)HTPFileClose(hstate, tx_ud, NULL, 0, FILE_TRUNCATED, STREAM_TOSERVER);
tx_ud->tsflags &= ~HTP_FILENAME_SET; tx_ud->tsflags &= ~HTP_FILENAME_SET;
} }
} }
@ -1981,7 +1980,7 @@ static int HTPCallbackResponseBodyData(htp_tx_data_t *d)
} else { } else {
if (tx_ud->tcflags & HTP_FILENAME_SET) { if (tx_ud->tcflags & HTP_FILENAME_SET) {
SCLogDebug("closing file that was being stored"); SCLogDebug("closing file that was being stored");
(void)HTPFileClose(hstate, NULL, 0, FILE_TRUNCATED, STREAM_TOCLIENT); (void)HTPFileClose(hstate, tx_ud, NULL, 0, FILE_TRUNCATED, STREAM_TOCLIENT);
tx_ud->tcflags &= ~HTP_FILENAME_SET; tx_ud->tcflags &= ~HTP_FILENAME_SET;
} }
} }
@ -2202,7 +2201,7 @@ static int HTPCallbackRequestComplete(htp_tx_t *tx)
if (htud != NULL) { if (htud != NULL) {
if (htud->tsflags & HTP_FILENAME_SET) { if (htud->tsflags & HTP_FILENAME_SET) {
SCLogDebug("closing file that was being stored"); SCLogDebug("closing file that was being stored");
(void)HTPFileClose(hstate, NULL, 0, 0, STREAM_TOSERVER); (void)HTPFileClose(hstate, htud, NULL, 0, 0, STREAM_TOSERVER);
htud->tsflags &= ~HTP_FILENAME_SET; htud->tsflags &= ~HTP_FILENAME_SET;
if (abs_right_edge < (uint64_t)UINT32_MAX) { if (abs_right_edge < (uint64_t)UINT32_MAX) {
StreamTcpReassemblySetMinInspectDepth( StreamTcpReassemblySetMinInspectDepth(
@ -2257,7 +2256,7 @@ static int HTPCallbackResponseComplete(htp_tx_t *tx)
if (htud != NULL) { if (htud != NULL) {
if (htud->tcflags & HTP_FILENAME_SET) { if (htud->tcflags & HTP_FILENAME_SET) {
SCLogDebug("closing file that was being stored"); SCLogDebug("closing file that was being stored");
(void)HTPFileClose(hstate, NULL, 0, 0, STREAM_TOCLIENT); (void)HTPFileClose(hstate, htud, NULL, 0, 0, STREAM_TOCLIENT);
htud->tcflags &= ~HTP_FILENAME_SET; htud->tcflags &= ~HTP_FILENAME_SET;
} }
} }

Write Preview
Loading…
Cancel
Save