Skip to content
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

backport: for ticket 7199 and 7318 #2179

Merged
merged 2 commits into from
Dec 12, 2024
+14 −35
Merged

backport: for ticket 7199 and 7318 #2179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b20169
backport: for ticket 7199 and 7318
catenacyber Dec 11, 2024
f1b2e30
tls: add ticket reference in READMEs
catenacyber Dec 11, 2024
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
1 change: 0 additions & 1 deletion tests/bug-7199/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ checks:
event_type: alert
alert.signature_id: 1
- filter:
min-version: 8
count: 1
match:
event_type: alert
Expand Down
2 changes: 2 additions & 0 deletions tests/dns/task-7018-dns-ips-stream-rule/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ requires:

args:
- -k none
- --set detect.guess-applayer-tx=true

pcap: ../task-7018-ids-dns-keywords/input.pcap

checks:
Expand Down
1 change: 1 addition & 0 deletions tests/dns/task-7018-ids-dns-stream-rule/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ requires:
lt-version: 8
args:
- -k none
- --set detect.guess-applayer-tx=true

pcap: ../task-7018-ids-dns-keywords/input.pcap
checks:
Expand Down
32 changes: 8 additions & 24 deletions tests/firewall/firewall-06-tls-sni-enforce/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,27 @@ args:

checks:
- filter:
min-version: 8
count: 24
match:
event_type: alert
alert.signature_id: 3
pkt_src: "wire/pcap"
- filter:
min-version: 8
count: 24
match:
event_type: alert
- filter:
lt-version: 7
count: 26
# check for https://redmine.openinfosecfoundation.org/issues/7350
min-version: 8
count: 4
match:
event_type: alert
alert.signature_id: 3
tls.sni: raw.githubusercontent.com
- filter:
lt-version: 7
count: 26
match:
event_type: alert
- filter:
min-version: 8
# check for https://redmine.openinfosecfoundation.org/issues/7350
count: 4
# version 7 does not use suricata.yaml stream-tx-log-limit
lt-version: 8
count: 24
match:
event_type: alert
alert.signature_id: 3
Expand All @@ -51,18 +47,6 @@ checks:
count: 26
match:
event_type: drop
- filter:
min-version: 8
count: 0
match:
event_type: alert
pkt_src: "stream (flow timeout)"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no value in keeping this check?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is improved by checking the alerts are all wire/pcap

- filter:
lt-version: 7
count: 2
match:
event_type: alert
pkt_src: "stream (flow timeout)"
- filter:
count: 1
match:
Expand Down
2 changes: 0 additions & 2 deletions tests/pgsql/pgsql-7000-ids/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
requires:
min-version: 8
args:
- -k none

Expand Down
3 changes: 0 additions & 3 deletions tests/pgsql/pgsql-bug-6983-ips/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
requires:
min-version: 8.0

pcap: ../pgsql-ssl-rejected-md5-auth-simple-query/input.pcap

args:
Expand Down
2 changes: 1 addition & 1 deletion tests/tls-extra-alert-engine-analysis/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ engine analysis complementary test for tls-extra-alert.

## Related issues

None so far. State: Trying to establish what's the issue.
https://redmine.openinfosecfoundation.org/issues/7318
1 change: 1 addition & 0 deletions tests/tls-extra-alert-engine-analysis/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# starting version 8 with engine analysis for flowbits
requires:
min-version: 8

Expand Down
2 changes: 1 addition & 1 deletion tests/tls-extra-alert/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ Internal.

## Related issues

None so far. State: Trying to establish what's the issue.
https://redmine.openinfosecfoundation.org/issues/7318
3 changes: 0 additions & 3 deletions tests/tls-extra-alert/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
requires:
min-version: 8

args:
- -k none
- --simulate-ips
Expand Down
Loading