Merged
Conversation
Instead of using flags to indicate a rule type, use an explicit `type` field. This will make it more clean in code paths what paths a rule is taking, and will allow easier debugging as well as analyzer output. Define the following fields: - SIG_TYPE_IPONLY: sig meets IP-only criteria and is handled by the IP-only engine. - SIG_TYPE_PDONLY: sig inspects protocol detection results only. - SIG_TYPE_DEONLY: sig inspects decoder events only. - SIG_TYPE_PKT: sig is inspected per packet. - SIG_TYPE_PKT_STREAM: sig is inspected against either packet payload or stream payload. - SIG_TYPE_STREAM: sig is inspected against the reassembled stream - SIG_TYPE_APPLAYER: sig is inspected against an app-layer property, but not against a tx engine. - SIG_TYPE_APP_TX: sig is inspected the tx aware inspection engine(s). Ticket: OISF#6085.
Per rule type record properties of the type.
Example output:
{
"raw": "alert udp any any -> any any (msg:\"UDP with flow direction\"; flow:to_server; sid:1001;)",
"id": 1001,
"gid": 1,
"rev": 0,
"msg": "UDP with flow direction",
"app_proto": "unknown",
"requirements": [],
"type": "pkt",
"flags": [
"src_any",
"dst_any",
"sp_any",
"dp_any",
"toserver"
],
"pkt_engines": [],
"frame_engines": [],
"lists": {}
}
Ticket: OISF#6085.
Some very minor changes to formatting.
Use try_reserve before growing the internal buffer, and the internal state vector. This allows allocation errors to be caught and an error returned instead of just aborting the process. Ticket: OISF#6057
For 7.0 multiple includes are allowed, but marked as deprecated. Update the example to show the new way of pulling in multiple includes.
Two "Logging changes" sections existed, merge.
Document how to use include files, plus add a deprecation notice on the use of multiple "include" statements.
Adds PDU, Header and Data frame to the MQTT parser. Ticket: 5731
get_tx_by_pkt_id loops only over the last transactions in case there is a transaction flood Ticket: OISF#6100
Don't update stat from loop as it's not read until after the loop.
To reduce locking overhead in the spare pool, batch returns per 100 (spare pool block size).
Since the queue isn't fully processed every run, double counting could happen. Fix by only counting actually processed flows from the queue.
In case small blocks of flows are returned, try to merge them with existing small list head. Add full block as second in the list as with the rest of the code.
victorjulien
requested review from
a team,
jasonish and
jufajardini
as code owners
Closed
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #8945 +/- ##
==========================================
+ Coverage 82.34% 82.39% +0.04%
==========================================
Files 969 969
Lines 273336 273558 +222
==========================================
+ Hits 225090 225387 +297
+ Misses 48246 48171 -75
Flags with carried forward coverage won't be shown. Click here to find out more. |
|
Information: QA ran without warnings. Pipeline 14151 |
Contributor
This was referenced May 31, 2023
This was referenced May 31, 2023
Closed
Closed
Closed
Member
Author
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Staging:
replaces #8942 dropping the smb patches. Those trip up QA and need further investigation.