Skip to content

framework: check lt_version gt_version consistency #2952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
catenacyber wants to merge 1 commit into from
Closed

framework: check lt_version gt_version consistency #2952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,12 +339,20 @@ def check_requires(requires, suricata_config: SuricataConfig, test_dir=None):
raise UnsatisfiedRequirementError(
"requires at least version {}".format(min_version))
elif key == "lt-version":
if "gt-version" in requires:
if not Version().is_lt(parse_suricata_version(requires["gt-version"]), parse_suricata_version(requires["lt-version"])):
raise ImpossibleRequirementError(
"test has both lt-version {} and gt-version {}".format(requires["lt-version"], requires["gt-version"]))
lt_version = requires["lt-version"]
if not is_version_compatible(version=lt_version,
suri_version=suri_version, expr="lt"):
raise UnsatisfiedRequirementError(
"for version less than {}".format(lt_version))
elif key == "gt-version":
if "lt-version" in requires:
if not Version().is_lt(parse_suricata_version(requires["gt-version"]), parse_suricata_version(requires["lt-version"])):
raise ImpossibleRequirementError(
"test has both lt-version {} and gt-version {}".format(requires["lt-version"], requires["gt-version"]))
gt_version = requires["gt-version"]
if not is_version_compatible(version=gt_version,
suri_version=suri_version, expr="gt"):
Expand Down
9 changes: 0 additions & 9 deletions tests/alert-max/alert-max-append-higher-priority-drop-5180-01/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ pcap: ../alert-max-append-higher-priority/input.pcap
checks:
# Sub-test 1
- filter:
requires:
lt-version: 8.0.4
gt-version: 8.0.4
count: 1
match:
event_type: alert
Expand All @@ -21,9 +18,6 @@ checks:
verdict.action: drop
# Sub-test 2
- filter:
requires:
lt-version: 8.0.4
gt-version: 8.0.4
count: 1
match:
event_type: alert
Expand Down Expand Up @@ -84,9 +78,6 @@ checks:
alert.signature_id: 5
# Sub-test 8
- filter:
requires:
lt-version: 8.0.4
gt-version: 8.0.4
count: 1
match:
event_type: drop
Expand Down
30 changes: 0 additions & 30 deletions tests/alert-max/alert-max-append-higher-priority-drop-5180-02/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,12 @@ args:
checks:
# Subtest 1
- filter:
requires:
lt-version: 8.0.4
gt-version: 8.0.4
count: 0
match:
event_type: alert
alert.signature_id: 1
# Subtest 2
- filter:
requires:
lt-version: 8.0.4
gt-version: 8.0.4
count: 1
match:
event_type: alert
Expand All @@ -28,9 +22,6 @@ checks:
verdict.action: drop
# Subtest 3
- filter:
requires:
lt-version: 8.0.4
gt-version: 8.0.4
count: 1
match:
event_type: alert
Expand All @@ -41,18 +32,12 @@ checks:
# Subtest 4
# Matches, but not enough space in packet alert queue
- filter:
requires:
lt-version: 8.0.4
gt-version: 8.0.4
count: 0
match:
event_type: alert
alert.signature_id: 4
# Subtest 5
- filter:
requires:
lt-version: 8.0.4
gt-version: 8.0.4
count: 1
match:
event_type: alert
Expand All @@ -63,47 +48,32 @@ checks:
# Subtest 6
# Matches, but not enough space in packet alert queue
- filter:
requires:
lt-version: 8.0.4
gt-version: 8.0.4
count: 0
match:
event_type: alert
alert.signature_id: 6
# Subtest 7
- filter:
requires:
lt-version: 8.0.4
gt-version: 8.0.4
count: 1
match:
event_type: drop
pcap_cnt: 1
drop.reason: rules
# Subtest 8
- filter:
requires:
lt-version: 8.0.4
gt-version: 8.0.4
count: 1
match:
event_type: drop
pcap_cnt: 2
drop.reason: "flow drop"
# Subtest 9
- filter:
requires:
lt-version: 8.0.4
gt-version: 8.0.4
count: 1
match:
event_type: flow
flow.action: "drop"
# Subtest 10
- filter:
requires:
lt-version: 8.0.4
gt-version: 8.0.4
count: 1
match:
event_type: stats
Expand Down
8 changes: 0 additions & 8 deletions tests/alert-max/alert-max-append-higher-priority-drop-5180-03/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ args:
checks:
# Sub-test 1
- filter:
requires:
lt-version: 8.0.4
gt-version: 8.0.4
count: 1
match:
event_type: alert
Expand All @@ -18,9 +15,6 @@ checks:
verdict.action: drop
# Sub-test 2
- filter:
requires:
lt-version: 8.0.4
gt-version: 8.0.4
count: 1
match:
event_type: alert
Expand Down Expand Up @@ -57,8 +51,6 @@ checks:
- filter:
requires:
min-version: 8.0.4
lt-version: 8.0.4
gt-version: 8.0.4
count: 1
match:
event_type: drop
Expand Down