git: a16cd5ff50ea - releng/13.3 - pf tests: ensure that traceroutes using ICMP work

The branch releng/13.3 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=a16cd5ff50ea2e5954958d90ef6de18e0f1aa4bc

commit a16cd5ff50ea2e5954958d90ef6de18e0f1aa4bc
Author:     Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2024-08-12 10:14:43 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-09-19 13:00:40 +0000

    pf tests: ensure that traceroutes using ICMP work
    
    Approved by:    so
    Security:       FreeBSD-EN-24:16.pf
    PR:             280701
    MFC after:      1 week
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    
    (cherry picked from commit 34063cb714602972b6d985ad747fc8f66a8daae1)
    (cherry picked from commit 7024e1066d5aba76dbbc85eb191357da7d32c619)
---
 tests/sys/netpfil/pf/icmp.sh  | 65 +++++++++++++++++++++++++++++++++++++++++++
 tests/sys/netpfil/pf/icmp6.sh | 65 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+)

diff --git a/tests/sys/netpfil/pf/icmp.sh b/tests/sys/netpfil/pf/icmp.sh
index 72b531b08c51..16c4123b8dfe 100644
--- a/tests/sys/netpfil/pf/icmp.sh
+++ b/tests/sys/netpfil/pf/icmp.sh
@@ -71,7 +71,72 @@ cve_2019_5598_cleanup()
 	pft_cleanup
 }
 
+atf_test_case "ttl_exceeded" "cleanup"
+ttl_exceeded_head()
+{
+	atf_set descr 'Test that we correctly translate TTL exceeded back'
+	atf_set require.user root
+}
+
+ttl_exceeded_body()
+{
+	pft_init
+
+	epair_srv=$(vnet_mkepair)
+	epair_int=$(vnet_mkepair)
+	epair_cl=$(vnet_mkepair)
+
+	vnet_mkjail srv ${epair_srv}a
+	jexec srv ifconfig ${epair_srv}a 192.0.2.1/24 up
+	jexec srv route add default 192.0.2.2
+
+	vnet_mkjail int ${epair_srv}b ${epair_int}a
+	jexec int sysctl net.inet.ip.forwarding=1
+	jexec int ifconfig ${epair_srv}b 192.0.2.2/24 up
+	jexec int ifconfig ${epair_int}a 203.0.113.2/24 up
+
+	vnet_mkjail nat ${epair_int}b ${epair_cl}b
+	jexec nat ifconfig ${epair_int}b 203.0.113.1/24 up
+	jexec nat ifconfig ${epair_cl}b 198.51.100.2/24 up
+	jexec nat sysctl net.inet.ip.forwarding=1
+	jexec nat route add default 203.0.113.2
+
+	vnet_mkjail cl ${epair_cl}a
+	jexec cl ifconfig ${epair_cl}a 198.51.100.1/24 up
+	jexec cl route add default 198.51.100.2
+
+	jexec nat pfctl -e
+	pft_set_rules nat \
+	    "nat on ${epair_int}b from 198.51.100.0/24 -> (${epair_int}b)" \
+	    "pass"
+
+	# Sanity checks
+	atf_check -s exit:0 -o ignore \
+	    jexec cl ping -c 1 198.51.100.2
+	atf_check -s exit:0 -o ignore \
+	    jexec cl ping -c 1 203.0.113.1
+	atf_check -s exit:0 -o ignore \
+	    jexec cl ping -c 1 203.0.113.2
+	atf_check -s exit:0 -o ignore \
+	    jexec cl ping -c 1 192.0.2.1
+
+	echo "UDP"
+	atf_check -s exit:0 -e ignore -o match:".*203.0.113.2.*" \
+	    jexec cl traceroute 192.0.2.1
+	jexec nat pfctl -Fs
+
+	echo "ICMP"
+	atf_check -s exit:0 -e ignore -o match:".*203.0.113.2.*" \
+	    jexec cl traceroute -I 192.0.2.1
+}
+
+ttl_exceeded_cleanup()
+{
+	pft_cleanup
+}
+
 atf_init_test_cases()
 {
 	atf_add_test_case "cve_2019_5598"
+	atf_add_test_case "ttl_exceeded"
 }
diff --git a/tests/sys/netpfil/pf/icmp6.sh b/tests/sys/netpfil/pf/icmp6.sh
index 35d20c83cc4f..c54b54c20a87 100644
--- a/tests/sys/netpfil/pf/icmp6.sh
+++ b/tests/sys/netpfil/pf/icmp6.sh
@@ -83,7 +83,72 @@ zero_id_cleanup()
 	pft_cleanup
 }
 
+atf_test_case "ttl_exceeded" "cleanup"
+ttl_exceeded_head()
+{
+	atf_set descr 'Test that we correctly translate TTL exceeded back'
+	atf_set require.user root
+}
+
+ttl_exceeded_body()
+{
+	pft_init
+
+	epair_srv=$(vnet_mkepair)
+	epair_int=$(vnet_mkepair)
+	epair_cl=$(vnet_mkepair)
+
+	vnet_mkjail srv ${epair_srv}a
+	jexec srv ifconfig ${epair_srv}a inet6 2001:db8:1::1/64 no_dad up
+	jexec srv route add -6 default 2001:db8:1::2
+
+	vnet_mkjail int ${epair_srv}b ${epair_int}a
+	jexec int sysctl net.inet6.ip6.forwarding=1
+	jexec int ifconfig ${epair_srv}b inet6 2001:db8:1::2/64 no_dad up
+	jexec int ifconfig ${epair_int}a inet6 2001:db8:2::2/64 no_dad up
+
+	vnet_mkjail nat ${epair_int}b ${epair_cl}b
+	jexec nat ifconfig ${epair_int}b inet6 2001:db8:2::1 no_dad up
+	jexec nat ifconfig ${epair_cl}b inet6 2001:db8:3::2/64 no_dad up
+	jexec nat sysctl net.inet6.ip6.forwarding=1
+	jexec nat route add -6 default 2001:db8:2::2
+
+	vnet_mkjail cl ${epair_cl}a
+	jexec cl ifconfig ${epair_cl}a inet6 2001:db8:3::1/64 no_dad up
+	jexec cl route add -6 default 2001:db8:3::2
+
+	jexec nat pfctl -e
+	pft_set_rules nat \
+	    "nat on ${epair_int}b from 2001:db8:3::/64 -> (${epair_int}b:0)" \
+	    "pass"
+
+	# Sanity checks
+	atf_check -s exit:0 -o ignore \
+	    jexec cl ping -c 1 2001:db8:3::2
+	atf_check -s exit:0 -o ignore \
+	    jexec cl ping -c 1 2001:db8:2::1
+	atf_check -s exit:0 -o ignore \
+	    jexec cl ping -c 1 2001:db8:2::2
+	atf_check -s exit:0 -o ignore \
+	    jexec cl ping -c 1 2001:db8:1::1
+
+	echo "UDP"
+	atf_check -s exit:0 -e ignore -o match:".*2001:db8:2::2.*" \
+	    jexec cl traceroute6 2001:db8:1::1
+	jexec nat pfctl -Fs
+
+	echo "ICMP"
+	atf_check -s exit:0 -e ignore -o match:".*2001:db8:2::2.*" \
+	    jexec cl traceroute6 -I 2001:db8:1::1
+}
+
+ttl_exceeded_cleanup()
+{
+	pft_cleanup
+}
+
 atf_init_test_cases()
 {
 	atf_add_test_case "zero_id"
+	atf_add_test_case "ttl_exceeded"
 }