The branch main has been updated by kp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=7309c551a56edeb2e3d35639ecb20b5a70885924
commit 7309c551a56edeb2e3d35639ecb20b5a70885924
Author: Kristof Provost <k...@freebsd.org>
AuthorDate: 2024-09-03 15:59:44 +0000
Commit: Kristof Provost <k...@freebsd.org>
CommitDate: 2024-09-19 20:20:13 +0000
pf tests: test the new log(matches) feature
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D46589
---
sbin/pfctl/tests/files/pf1023.in | 3 ++
sbin/pfctl/tests/files/pf1023.ok | 3 ++
sbin/pfctl/tests/pfctl_test_list.inc | 1 +
tests/sys/netpfil/pf/pflog.sh | 54 ++++++++++++++++++++++++++++++++++++
4 files changed, 61 insertions(+)
diff --git a/sbin/pfctl/tests/files/pf1023.in b/sbin/pfctl/tests/files/pf1023.in
new file mode 100644
index 000000000000..4855ae0f339e
--- /dev/null
+++ b/sbin/pfctl/tests/files/pf1023.in
@@ -0,0 +1,3 @@
+match log(matches) inet proto tcp
+match log(matches) inet from 192.0.2.0/24
+pass
diff --git a/sbin/pfctl/tests/files/pf1023.ok b/sbin/pfctl/tests/files/pf1023.ok
new file mode 100644
index 000000000000..63fa40113ecf
--- /dev/null
+++ b/sbin/pfctl/tests/files/pf1023.ok
@@ -0,0 +1,3 @@
+match log (matches) inet proto tcp all
+match log (matches) inet from 192.0.2.0/24 to any
+pass all flags S/SA keep state
diff --git a/sbin/pfctl/tests/pfctl_test_list.inc
b/sbin/pfctl/tests/pfctl_test_list.inc
index 0ab336ec100d..413599252f64 100644
--- a/sbin/pfctl/tests/pfctl_test_list.inc
+++ b/sbin/pfctl/tests/pfctl_test_list.inc
@@ -131,3 +131,4 @@ PFCTL_TEST(1019, "Test pflow option")
PFCTL_TEST(1020, "Test hashmark and semicolon comment")
PFCTL_TEST(1021, "Endpoint-independent")
PFCTL_TEST(1022, "Test received-on")
+PFCTL_TEST(1023, "Test match log(matches)")
diff --git a/tests/sys/netpfil/pf/pflog.sh b/tests/sys/netpfil/pf/pflog.sh
index 75b7c5c217bb..f5a1241cb5a8 100644
--- a/tests/sys/netpfil/pf/pflog.sh
+++ b/tests/sys/netpfil/pf/pflog.sh
@@ -79,7 +79,61 @@ malformed_cleanup()
pft_cleanup
}
+atf_test_case "matches" "cleanup"
+matches_head()
+{
+ atf_set descr 'Test the pflog matches keyword'
+ atf_set require.user root
+}
+
+matches_body()
+{
+ pflog_init
+
+ epair=$(vnet_mkepair)
+
+ vnet_mkjail alcatraz ${epair}a
+ jexec alcatraz ifconfig ${epair}a 192.0.2.1/24 up
+
+ ifconfig ${epair}b 192.0.2.2/24 up
+
+ # Sanity check
+ atf_check -s exit:0 -o ignore \
+ ping -c 1 192.0.2.1
+
+ jexec alcatraz pfctl -e
+ jexec alcatraz ifconfig pflog0 up
+ pft_set_rules alcatraz \
+ "match log(matches) inet proto icmp" \
+ "match log(matches) inet from 192.0.2.2" \
+ "pass"
+
+ jexec alcatraz tcpdump -n -e -ttt --immediate-mode -l -U -i pflog0 >>
${PWD}/pflog.txt &
+ sleep 1 # Wait for tcpdump to start
+
+ atf_check -s exit:0 -o ignore \
+ ping -c 1 192.0.2.1
+
+ echo "Rules"
+ jexec alcatraz pfctl -sr -vv
+ echo "States"
+ jexec alcatraz pfctl -ss -vv
+ echo "Log"
+ cat ${PWD}/pflog.txt
+
+ atf_check -o match:".*rule 0/0\(match\): match in on ${epair}a:
192.0.2.2 > 192.0.2.1: ICMP echo request.*" \
+ cat pflog.txt
+ atf_check -o match:".*rule 1/0\(match\): match in on ${epair}a:
192.0.2.2 > 192.0.2.1: ICMP echo request.*" \
+ cat pflog.txt
+}
+
+matches_cleanup()
+{
+ pft_cleanup
+}
+
atf_init_test_cases()
{
atf_add_test_case "malformed"
+ atf_add_test_case "matches"
}
