diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh index 41ff4e3da84e..e6b8a8bb6d0f 100644 --- a/tests/sys/netpfil/pf/table.sh +++ b/tests/sys/netpfil/pf/table.sh @@ -1,253 +1,290 @@ # $FreeBSD$ # # SPDX-License-Identifier: BSD-2-Clause-FreeBSD # # Copyright (c) 2020 Mark Johnston # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. . $(atf_get_srcdir)/utils.subr TABLE_STATS_ZERO_REGEXP='Packets: 0[[:space:]]*Bytes: 0[[:space:]]' TABLE_STATS_NONZERO_REGEXP='Packets: [1-9][0-9]*[[:space:]]*Bytes: [1-9][0-9]*[[:space:]]' atf_test_case "v4_counters" "cleanup" v4_counters_head() { atf_set descr 'Verify per-address counters for v4' atf_set require.user root } v4_counters_body() { pft_init epair_send=$(vnet_mkepair) ifconfig ${epair_send}a 192.0.2.1/24 up vnet_mkjail alcatraz ${epair_send}b jexec alcatraz ifconfig ${epair_send}b 192.0.2.2/24 up jexec alcatraz pfctl -e pft_set_rules alcatraz \ "table counters { 192.0.2.1 }" \ "block all" \ "pass in from to any" \ "pass out from any to " atf_check -s exit:0 -o ignore ping -c 3 192.0.2.2 atf_check -s exit:0 -e ignore \ -o match:'In/Block:.*'"$TABLE_STATS_ZERO_REGEXP" \ -o match:'In/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ -o match:'Out/Block:.*'"$TABLE_STATS_ZERO_REGEXP" \ -o match:'Out/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ jexec alcatraz pfctl -t foo -T show -vv } v4_counters_cleanup() { pft_cleanup } atf_test_case "v6_counters" "cleanup" v6_counters_head() { atf_set descr 'Verify per-address counters for v6' atf_set require.user root } v6_counters_body() { pft_init epair_send=$(vnet_mkepair) ifconfig ${epair_send}a inet6 2001:db8:42::1/64 up no_dad -ifdisabled vnet_mkjail alcatraz ${epair_send}b jexec alcatraz ifconfig ${epair_send}b inet6 2001:db8:42::2/64 up no_dad jexec alcatraz pfctl -e pft_set_rules alcatraz \ "table counters { 2001:db8:42::1 }" \ "block all" \ "pass in from to any" \ "pass out from any to " atf_check -s exit:0 -o ignore ping6 -c 3 2001:db8:42::2 atf_check -s exit:0 -e ignore \ -o match:'In/Block:.*'"$TABLE_STATS_ZERO_REGEXP" \ -o match:'In/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ -o match:'Out/Block:.*'"$TABLE_STATS_ZERO_REGEXP" \ -o match:'Out/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ jexec alcatraz pfctl -t foo6 -T show -vv } v6_counters_cleanup() { pft_cleanup } atf_test_case "pr251414" "cleanup" pr251414_head() { atf_set descr 'Test PR 251414' atf_set require.user root } pr251414_body() { pft_init epair_send=$(vnet_mkepair) ifconfig ${epair_send}a 192.0.2.1/24 up vnet_mkjail alcatraz ${epair_send}b jexec alcatraz ifconfig ${epair_send}b 192.0.2.2/24 up jexec alcatraz pfctl -e pft_set_rules alcatraz \ "pass all" \ "table { self }" \ "pass in log to " pft_set_rules noflush alcatraz \ "pass all" \ "table counters { self }" \ "pass in log to " atf_check -s exit:0 -o ignore ping -c 3 192.0.2.2 jexec alcatraz pfctl -t tab -T show -vv } pr251414_cleanup() { pft_cleanup } atf_test_case "network" "cleanup" network_head() { atf_set descr 'Test :network' atf_set require.user root } network_body() { pft_init epair=$(vnet_mkepair) ifconfig ${epair}a 192.0.2.1/24 up vnet_mkjail alcatraz ${epair}b jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up jexec alcatraz pfctl -e pft_set_rules alcatraz \ "table const { epair:network }"\ "block in" \ "pass in from " atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 } network_cleanup() { pft_cleanup } atf_test_case "automatic" "cleanup" automatic_head() { atf_set descr "Test automatic - optimizer generated - tables" atf_set require.user root } automatic_body() { pft_init epair=$(vnet_mkepair) ifconfig ${epair}a 192.0.2.1/24 up vnet_mkjail alcatraz ${epair}b jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up jexec alcatraz pfctl -e pft_set_rules alcatraz \ "block in" \ "pass in proto icmp from 192.0.2.1" \ "pass in proto icmp from 192.0.2.3" \ "pass in proto icmp from 192.0.2.4" \ "pass in proto icmp from 192.0.2.5" \ "pass in proto icmp from 192.0.2.6" \ "pass in proto icmp from 192.0.2.7" \ "pass in proto icmp from 192.0.2.8" \ "pass in proto icmp from 192.0.2.9" atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 } automatic_cleanup() { pft_cleanup } atf_test_case "pr259689" "cleanup" pr259689_head() { atf_set descr 'Test PR 259689' atf_set require.user root } pr259689_body() { pft_init vnet_mkjail alcatraz jexec alcatraz pfctl -e pft_set_rules alcatraz \ "pass in" \ "block in inet from { 1.1.1.1, 1.1.1.2, 2.2.2.2, 2.2.2.3, 4.4.4.4, 4.4.4.5 }" atf_check -o match:'block drop in inet from <__automatic_.*:6> to any' \ -e ignore \ jexec alcatraz pfctl -sr -vv } pr259689_cleanup() { pft_cleanup } +atf_test_case "precreate" "cleanup" +precreate_head() +{ + atf_set descr 'Test creating a table without counters, then loading rules that add counters' + atf_set require.user root +} + +precreate_body() +{ + pft_init + +set -x + vnet_mkjail alcatraz + + jexec alcatraz pfctl -t foo -T add 192.0.2.1 + jexec alcatraz pfctl -t foo -T show + + pft_set_rules noflush alcatraz \ + "table counters persist" \ + "pass in from " + + # Expect all counters to be zero + atf_check -s exit:0 -e ignore \ + -o match:'In/Block:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'In/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'Out/Block:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + jexec alcatraz pfctl -t foo -T show -vv + +} + +precreate_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "v4_counters" atf_add_test_case "v6_counters" atf_add_test_case "pr251414" atf_add_test_case "network" atf_add_test_case "automatic" atf_add_test_case "pr259689" + atf_add_test_case "precreate" }