1 files changed, 59 insertions, 2 deletions
diff --git a/tests/sys/netpfil/pf/anchor.sh b/tests/sys/netpfil/pf/anchor.sh
index b4b52d7a24d6..64ca84b34c3d 100644
--- a/tests/sys/netpfil/pf/anchor.sh
+++ b/tests/sys/netpfil/pf/anchor.sh
@@ -350,9 +350,9 @@ nat_body()
 	jexec alcatraz pfctl -sn -a "foo/bar"
 	jexec alcatraz pfctl -sn -a "foo/baz"
 
-	atf_check -s exit:0 -o match:"nat log on epair0a inet from 192.0.2.0/24 to any port = domain -> 192.0.2.1" \
+	atf_check -s exit:0 -o match:"nat log on ${epair}a inet from 192.0.2.0/24 to any port = domain -> 192.0.2.1" \
 	    jexec alcatraz pfctl -sn -a "*"
-	atf_check -s exit:0 -o match:"rdr on epair0a inet proto tcp from any to any port = echo -> 127.0.0.1 port 7" \
+	atf_check -s exit:0 -o match:"rdr on ${epair}a inet proto tcp from any to any port = echo -> 127.0.0.1 port 7" \
 	    jexec alcatraz pfctl -sn -a "*"
 }
 
@@ -437,6 +437,62 @@ quick_cleanup()
 	pft_cleanup
 }
 
+atf_test_case "recursive_flush" "cleanup"
+recursive_flush_head()
+{
+	atf_set descr 'Test recursive flushing of rules'
+	atf_set require.user root
+}
+
+recursive_flush_body()
+{
+	pft_init
+
+	epair=$(vnet_mkepair)
+	vnet_mkjail alcatraz ${epair}a
+
+	ifconfig ${epair}b 192.0.2.2/24 up
+	jexec alcatraz ifconfig ${epair}a 192.0.2.1/24 up
+
+	# Sanity check
+	atf_check -s exit:0 -o ignore ping -c 1 192.0.2.1
+
+	jexec alcatraz pfctl -e
+	pft_set_rules alcatraz \
+	    "block" \
+	    "anchor \"foo\" {\n\
+	        pass\n\
+	    }"
+
+	# We can ping thanks to the pass rule in foo
+	atf_check -s exit:0 -o ignore ping -c 1 192.0.2.1
+
+	# Only reset the main rules. I.e. not a recursive flush
+	pft_set_rules alcatraz \
+	    "block" \
+	    "anchor \"foo\""
+
+	# "foo" still has the pass rule, so this works
+	jexec alcatraz pfctl -a "*" -sr
+	atf_check -s exit:0 -o ignore ping -c 1 192.0.2.1
+
+	# Now do a recursive flush
+	atf_check -s exit:0 -e ignore -o ignore \
+	    jexec alcatraz pfctl -a "*" -Fr
+	pft_set_rules alcatraz \
+	    "block" \
+	    "anchor \"foo\""
+
+	# So this fails
+	jexec alcatraz pfctl -a "*" -sr
+	atf_check -s exit:2 -o ignore ping -c 1 192.0.2.1
+}
+
+recursive_flush_cleanup()
+{
+	pft_cleanup
+}
+
 atf_init_test_cases()
 {
 	atf_add_test_case "pr183198"
@@ -450,4 +506,5 @@ atf_init_test_cases()
 	atf_add_test_case "nat"
 	atf_add_test_case "include"
 	atf_add_test_case "quick"
+	atf_add_test_case "recursive_flush"
 }