next/233/20231219/v1 #10076
Merged
next/233/20231219/v1 #10076
Conversation
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
Even when on detection-only mode. So that we always have enip_tcp and enip_udp in stats and never just `enip`. Ticket: 6304
./stats/app_layer/error/modbus
The `ConsolidatedDataRow` struct had a `length` field that wasn't truly used. Related to Bug OISF#6389
As the feature module is not available for Rust unit tests, a mock version is also provided.
Add a new rule keyword "requires" that allows a rule to require specific Suricata versions and/or Suricata features to be enabled. Example: requires: feature geoip, version >= 7.0.0, version < 8; requires: version >= 7.0.3 < 8 requires: version >= 7.0.3 < 8 | >= 8.0.3 Feature: OISF#5972 Co-authored-by: Philippe Antoine <[email protected]>
Add a "pre-scan" rule parse that will check for requires statement. It will return a special error code (-4) if the requires fails due to missing requirements. Syntactic errors will also abort parsing here. Feature: OISF#5972
During the pre-scan for "requires", also parse the SID if possible. If the rule fails high level parsing (syntax), the SID will not be parsed. But every keyword other than "sid" and "requires" should expect to be provided with a parsed sid.
victorjulien
requested review from
jufajardini,
jasonish and
a team
as code owners
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #10076 +/- ##
==========================================
- Coverage 82.39% 82.19% -0.21%
==========================================
Files 972 975 +3
Lines 271406 271940 +534
==========================================
- Hits 223624 223517 -107
- Misses 47782 48423 +641
Flags with carried forward coverage won't be shown. Click here to find out more. |
catenacyber
approved these changes
Dec 19, 2023
jasonish
approved these changes
Dec 19, 2023
|
Information: QA ran without warnings. Pipeline 17145 |
This was referenced Dec 19, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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:
SV_BRANCH=OISF/suricata-verify#1558