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

next/sv/211/20231205/v1 #1513

Merged
merged 1 commit into from
Dec 6, 2023
Merged
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
15 changes: 15 additions & 0 deletions tests/pgsql-bug-6080-probe-test-01/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Test Description

The probing function for PGSQL, in some scenarios, could identify any TCP message
sent to the standard PGSQL port - 5432 - as PGSQL traffic, leading to false
positives.

## PCAP

This pcap was created using the Scapy script included in the test directory,
to reproduce a non-shareable traffic capture.

## Related issues

Bug report on Redmine:
https://redmine.openinfosecfoundation.org/issues/6080
Binary file added tests/pgsql-bug-6080-probe-test-01/input.pcap
Binary file not shown.
18 changes: 18 additions & 0 deletions tests/pgsql-bug-6080-probe-test-01/suricata.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
%YAML 1.1
---

app-layer:
protocols:
pgsql:
enabled: yes
stream-depth: 0

outputs:
- eve-log:
enabled: yes
filetype: regular
filename: eve.json
types:
- pgsql
- flow

22 changes: 22 additions & 0 deletions tests/pgsql-bug-6080-probe-test-01/test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
requires:
min-version: 8

args:
- -k none

checks:
- filter:
count: 0
match:
dest_port: 5432
event_type: pgsql
proto: TCP
- filter:
count: 0
match:
app_proto: pgsql
event_type: flow
- filter:
count: 1
match:
event_type: flow
31 changes: 31 additions & 0 deletions tests/pgsql-bug-6080-probe-test-01/writepcap.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/usr/bin/env python
from scapy.all import *

pkts = []
'''packet 1'''
pkts += IP(dst='172.16.4.19', src='172.16.1.1')/TCP(sport=1050, dport=5432, flags='S', window=65535, seq=0, options=[('MSS', 1460), ('SAckOK', '')])
'''packet 2'''
pkts += IP(src='172.16.4.19', dst='172.16.1.1')/TCP(dport=1050, sport=5432,
flags='S''A', ack=1, window=5840, seq=0, options=[('MSS', 1460), ('SAckOK', '')])
'''packet 3'''
pkts += IP(dst='172.16.4.19', src='172.16.1.1')/TCP(sport=1050, dport=5432, flags='A', ack=1, window=65535, seq=1)
'''packet 4'''
pkts += IP(dst='172.16.4.19', src='172.16.1.1')/TCP(sport=1050, dport=5432, flags='P''A', ack=1, window=65535, seq=98080856)
'''packet 5'''
pkts += IP(src='172.16.4.19', dst='172.16.1.1')/TCP(dport=1050, sport=5432, flags='A', ack=37, window=5840, seq=1)
'''packet 6'''
pkts += IP(src='172.16.4.19', dst='172.16.1.1')/TCP(dport=1050, sport=5432, flags='P''A', ack=37, window=5840, seq=1)/":"
'''packet 7'''
pkts += IP(dst='172.16.4.19', src='172.16.1.1')/TCP(sport=1050, dport=5432, flags='A', ack=37, window=65534, seq=2)
'''packet 8'''
pkts += IP(src='172.16.4.19', dst='172.16.1.1')/TCP(dport=1050, sport=5432, flags='P''A', ack=37, window=5840, seq=2)/"p1r473.server.org\x01\n"
'''packet 9'''
pkts += IP(dst='172.16.4.19', src='172.16.1.1')/TCP(sport=1050, dport=5432, flags='P''A', ack=1363, window=64173, seq=37)
'''packet 10'''
pkts += IP(dst='172.16.4.19', src='172.16.1.1')/TCP(sport=1050, dport=5432, flags='F''P''A', ack=1363, window=64173, seq=53)
'''packet 11'''
pkts += IP(src='172.16.4.19', dst='172.16.1.1')/TCP(dport=1050, sport=5432, flags='P''A', ack=200, window=6432, seq=1363)/":"
'''packet 12'''
pkts += IP(dst='172.16.4.19', src='172.16.1.1')/TCP(sport=1050, dport=5432, flags='R''A', ack=1364, window=0, seq=200)

wrpcap('input.pcap', pkts)
Loading