detect/filestore: fix options handling and impact #12312
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -98,6 +98,47 @@ void DetectFilestoreRegister(void) | |
| g_file_match_list_id = DetectBufferTypeRegister("files"); | ||
| } | ||
|
|
||
| static void FilestoreTriggerFlowStorage( | ||
| Flow *f, int toserver_dir, int toclient_dir, uint64_t init_tx_id) | ||
| { | ||
| SCLogDebug("init tx_id is: %ld", init_tx_id); | ||
| /* set flags in Flow and AppLayerStateData */ | ||
| AppLayerStateData *sd = AppLayerParserGetStateData(f->proto, f->alproto, f->alstate); | ||
| if (toclient_dir) { | ||
| f->file_flags |= FLOWFILE_STORE_TC; | ||
| if (sd != NULL) { | ||
| sd->file_flags |= FLOWFILE_STORE_TC; | ||
| } | ||
| } | ||
| if (toserver_dir) { | ||
| f->file_flags |= FLOWFILE_STORE_TS; | ||
| if (sd != NULL) { | ||
| sd->file_flags |= FLOWFILE_STORE_TS; | ||
| } | ||
| } | ||
| /* Start storage for all existing files attached to the flow in correct direction */ | ||
| void *alstate = FlowGetAppState(f); | ||
| if (alstate != NULL) { | ||
| uint64_t total_txs = AppLayerParserGetTxCnt(f, alstate); | ||
| for (uint64_t tx_id = init_tx_id; tx_id < total_txs; tx_id++) { | ||
| void *txv = AppLayerParserGetTx(f->proto, f->alproto, alstate, tx_id); | ||
| DEBUG_VALIDATE_BUG_ON(txv == NULL); | ||
| if (txv != NULL) { | ||
| AppLayerTxData *txd = AppLayerParserGetTxData(f->proto, f->alproto, txv); | ||
| DEBUG_VALIDATE_BUG_ON(txd == NULL); | ||
| if (txd != NULL) { | ||
| if (toclient_dir) { | ||
| txd->file_flags |= FLOWFILE_STORE_TC; | ||
|
There was a problem hiding this comment. I do not think we need to set |
||
| } | ||
| if (toserver_dir) { | ||
| txd->file_flags |= FLOWFILE_STORE_TS; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * \brief apply the post match filestore with options | ||
| */ | ||
|
|
@@ -170,20 +211,7 @@ static int FilestorePostMatchWithOptions(Packet *p, Flow *f, const DetectFilesto | |
| } | ||
| } | ||
| } else if (this_flow) { | ||
| FilestoreTriggerFlowStorage(f, toserver_dir, toclient_dir, tx_id); | ||
| } else { | ||
| FileStoreFileById(fc, file_id); | ||
| } | ||
|
|
@@ -207,11 +235,33 @@ static int DetectFilestorePostMatch(DetectEngineThreadCtx *det_ctx, | |
| { | ||
| SCEnter(); | ||
|
|
||
| DEBUG_VALIDATE_BUG_ON(p->flow == NULL); | ||
|
|
||
| if (det_ctx->filestore_cnt == 0) { | ||
|
There was a problem hiding this comment. By the way, Its scope is one packet when a signature can take multiple packets to match... |
||
| /* here we have no file but the signature is fully matched and | ||
| filestore option indicate we need to extract for file for the session | ||
| so we trigger flow storage. */ | ||
| if (s->filestore_ctx && (s->filestore_ctx->scope == FILESTORE_SCOPE_SSN)) { | ||
| int toserver_dir = 0; | ||
| int toclient_dir = 0; | ||
| switch (s->filestore_ctx->direction) { | ||
| case FILESTORE_DIR_BOTH: | ||
| toserver_dir = 1; | ||
| toclient_dir = 1; | ||
| break; | ||
| case FILESTORE_DIR_TOSERVER: | ||
| toserver_dir = 1; | ||
| break; | ||
| case FILESTORE_DIR_TOCLIENT: | ||
| toclient_dir = 1; | ||
| break; | ||
| } | ||
| FilestoreTriggerFlowStorage(p->flow, toserver_dir, toclient_dir, det_ctx->tx_id); | ||
| } | ||
| SCReturnInt(0); | ||
| } | ||
|
|
||
| if (s->filestore_ctx == NULL && !(s->flags & SIG_FLAG_FILESTORE)) { | ||
| #ifndef DEBUG | ||
| SCReturnInt(0); | ||
| #else | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But postmatch does not make signature fail to match, does it ?
I see
(void)sigmatch_table[smd->type].Match(det_ctx, p, s, smd->ctx);return code ignored inDetectRunPostMatchThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, before we were not going to postmatch as the filestore without file was the cases where ffc or ffc->head were null and as a result it was a NO_MATCH.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understand a bit more.
Why not handle
FILESTORE_SCOPE_TXin postmatch as well ?Is it not a problem if the signature matched so far but will not fully match in the end ?