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.

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

Bug 7318/v4 #2174

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions tests/firewall/firewall-06-tls-sni-enforce/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,24 @@ args:

checks:
- filter:
min-version: 8
count: 24
match:
event_type: alert
alert.signature_id: 3
- filter:
min-version: 8
count: 24
match:
event_type: alert
- filter:
lt-version: 7
count: 26
match:
event_type: alert
alert.signature_id: 3
- filter:
lt-version: 7
count: 26
match:
event_type: alert
Expand All @@ -31,6 +44,13 @@ checks:
match:
event_type: drop
- filter:
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think these checks should be dropped, and test the pkt_src in the first check

Copy link
Member Author

Choose a reason for hiding this comment

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

we can patch it up later

min-version: 8
count: 0
match:
event_type: alert
pkt_src: "stream (flow timeout)"
- filter:
lt-version: 7
count: 2
match:
event_type: alert
Expand Down
7 changes: 7 additions & 0 deletions tests/tls-extra-alert-engine-analysis/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Test Description

engine analysis complementary test for tls-extra-alert.

## Related issues

None so far. State: Trying to establish what's the issue.
5 changes: 5 additions & 0 deletions tests/tls-extra-alert-engine-analysis/test.rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
alert tcp any any -> any 443 (flow: to_server; flags: S,CE; flowbits:set, tls_tracker; flowbits: noalert; sid:09901001; )
alert tcp any any -> any 443 (flowbits:isset, tls_tracker; content: "|15 03 01 00 02 02|"; startswith; flowbits:set, tls_error; sid:09901031; rev:1; msg:"TLS 1.2 Fatal Alert (outgoing packet)"; )
alert tcp any 443 -> any any (flowbits:isset, tls_tracker; content: "|15 03 01 00 02 02|"; startswith; flowbits:set, tls_error; sid:09901032; rev:1; msg:"TLS 1.2 Fatal Alert (incoming packet)"; )
alert tcp any any -> any 443 (flow: to_server; flowbits:isset, tls_error; sid:09901033; rev:1; msg:"Allow TLS error handling (outgoing packet)"; )
alert tcp any 443 -> any any (flow: to_client; flowbits:isset, tls_error; sid:09901034; rev:1; msg:"Allow TLS error handling (incoming packet)"; )
229 changes: 229 additions & 0 deletions tests/tls-extra-alert-engine-analysis/test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,229 @@
requires:
min-version: 8

args:
- --simulate-ips
- --engine-analysis

pcap: false

checks:
- filter:
filename: rules.json
count: 1
match:
flags:
- src_any
- dst_any
- sp_any
- noalert
- need_packet
- toserver
id: 9901001
lists:
packet:
matches:
- name: tcp.flags
postmatch:
matches:
- flowbits:
cmd: set
names:
- tls_tracker
name: flowbits
pkt_engines:
- is_mpm: false
name: packet
requirements:
- tcp_flags_init_deinit
- real_pkt
type: pkt

- filter:
filename: rules.json
count: 1
match:
flags:
- src_any
- dst_any
- sp_any
- need_packet
- need_stream
- need_flowvar
- toserver
- toclient
- prefilter
id: 9901031
lists:
packet:
matches:
- flowbits:
cmd: isset
names:
- tls_tracker
name: flowbits
payload:
matches:
- content:
depth: 6
ends_with: false
fast_pattern: false
is_mpm: true
length: 6
negated: false
no_double_inspect: false
nocase: false
pattern: '|15 03 01 00 02 02|'
relative_next: false
starts_with: true
name: content
postmatch:
matches:
- flowbits:
cmd: set
names:
- tls_error
name: flowbits
mpm:
buffer: payload
depth: 6
ends_with: false
fast_pattern: false
is_mpm: true
length: 6
negated: false
no_double_inspect: false
nocase: false
pattern: '|15 03 01 00 02 02|'
relative_next: false
starts_with: true
pkt_engines:
- is_mpm: true
name: payload
- is_mpm: false
name: packet
requirements:
- payload
- flow
type: pkt_stream

- filter:
filename: rules.json
count: 1
match:
flags:
- src_any
- dst_any
- dp_any
- need_packet
- need_stream
- need_flowvar
- toserver
- toclient
- prefilter
id: 9901032
lists:
packet:
matches:
- flowbits:
cmd: isset
names:
- tls_tracker
name: flowbits
payload:
matches:
- content:
depth: 6
ends_with: false
fast_pattern: false
is_mpm: true
length: 6
negated: false
no_double_inspect: false
nocase: false
pattern: '|15 03 01 00 02 02|'
relative_next: false
starts_with: true
name: content
postmatch:
matches:
- flowbits:
cmd: set
names:
- tls_error
name: flowbits
mpm:
buffer: payload
depth: 6
ends_with: false
fast_pattern: false
is_mpm: true
length: 6
negated: false
no_double_inspect: false
nocase: false
pattern: '|15 03 01 00 02 02|'
relative_next: false
starts_with: true
pkt_engines:
- is_mpm: true
name: payload
- is_mpm: false
name: packet
requirements:
- payload
- flow
type: pkt_stream

# Following is the signature of interest
- filter:
filename: rules.json
count: 1
match:
flags:
- src_any
- dst_any
- sp_any
- need_flowvar
- toserver
id: 9901033
lists:
packet:
matches:
- flowbits:
cmd: isset
names:
- tls_error
name: flowbits
pkt_engines:
- is_mpm: false
name: packet
requirements:
- flow
type: pkt

- filter:
filename: rules.json
count: 1
match:
flags:
- src_any
- dst_any
- dp_any
- need_flowvar
- toclient
id: 9901034
lists:
packet:
matches:
- flowbits:
cmd: isset
names:
- tls_error
name: flowbits
pkt_engines:
- is_mpm: false
name: packet
requirements:
- flow
type: pkt
12 changes: 12 additions & 0 deletions tests/tls-extra-alert/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Test Description

This test shows that Suricata generates an additional alert for TLS
for the given PCAP which shouldn't be there.

## PCAP

Internal.

## Related issues

None so far. State: Trying to establish what's the issue.
Copy link
Member

Choose a reason for hiding this comment

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

Binary file added tests/tls-extra-alert/input.pcap
Binary file not shown.
5 changes: 5 additions & 0 deletions tests/tls-extra-alert/test.rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
alert tcp any any -> any 443 (flow: to_server; flags: S,CE; flowbits:set, tls_tracker; flowbits: noalert; sid:09901001; )
alert tcp any any -> any 443 (flowbits:isset, tls_tracker; content: "|15 03 01 00 02 02|"; startswith; flowbits:set, tls_error; sid:09901031; rev:1; msg:"TLS 1.2 Fatal Alert (outgoing packet)"; )
alert tcp any 443 -> any any (flowbits:isset, tls_tracker; content: "|15 03 01 00 02 02|"; startswith; flowbits:set, tls_error; sid:09901032; rev:1; msg:"TLS 1.2 Fatal Alert (incoming packet)"; )
alert tcp any any -> any 443 (flow: to_server; flowbits:isset, tls_error; sid:09901033; rev:1; msg:"Allow TLS error handling (outgoing packet)"; )
alert tcp any 443 -> any any (flow: to_client; flowbits:isset, tls_error; sid:09901034; rev:1; msg:"Allow TLS error handling (incoming packet)"; )
19 changes: 19 additions & 0 deletions tests/tls-extra-alert/test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
requires:
min-version: 8

args:
- -k none
- --simulate-ips

checks:
- filter:
count: 2
match:
event_type: alert
alert.signature_id: 9901033
pkt_src: wire/pcap
- filter:
count: 0
match:
event_type: alert
not-has-key: pcap_cnt
Loading