Update threshold rule schema to disallow empty field string #1098
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
brokensound77
added
Rule: Tuning
rw-access
reviewed
Apr 12, 2021
detection_rules/schemas/base.py
Outdated
| @@ -15,6 +15,7 @@ | |||
|
|
|||
| DATE_PATTERN = r'\d{4}/\d{2}/\d{2}' | |||
| MATURITY_LEVELS = ['development', 'experimental', 'beta', 'production', 'deprecated'] | |||
| NON_EMPTY_STR = r'.+' | |||
There was a problem hiding this comment.
Suggested change
| NON_EMPTY_STR = r'.+' |
rw-access
reviewed
Apr 12, 2021
detection_rules/schemas/v7_12.py
Outdated
| @@ -31,7 +32,7 @@ class ThresholdCardinality(jsl.Document): | |||
| field = jsl.StringField(required=True) | |||
| value = jsl.IntField(minimum=1, required=True) | |||
|
|
|||
| field = jsl.ArrayField(jsl.StringField(required=True, default="")) | |||
| field = jsl.ArrayField(jsl.StringField(required=False, pattern=NON_EMPTY_STR), required=True) | |||
There was a problem hiding this comment.
Suggested change
| field = jsl.ArrayField(jsl.StringField(required=False, pattern=NON_EMPTY_STR), required=True) | |
| field = jsl.ArrayField(jsl.StringField(required=False, min_length=1), required=True) |
rw-access
approved these changes
Apr 12, 2021
|
Done 👍 . I also locked versions as this should be the last change to 7.12.1 |
rw-access
reviewed
Apr 12, 2021
| "sha256": "9aeb1b1c1c4b9fb39b564774f25afea20210e5789afbde43998e680892678b7c", | ||
| "version": 3 | ||
| "sha256": "9aee800e271c99dfee70b36fbe34a3607ad2b2c9030f77b26db66977cce7621f", | ||
| "version": 4 |
There was a problem hiding this comment.
😆 the joys of versioning
There was a problem hiding this comment.
don't forget to pull this lock into main btw
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.
Issues
related to #1097
related to #1099 (same change targeting main)
Summary
Changes
threshold.fieldto disallow empty strings and instead just use an empty array for non-defined values.