Index: stable/12/tests/sys/netpfil/pf/forward.sh =================================================================== --- stable/12/tests/sys/netpfil/pf/forward.sh (revision 368665) +++ stable/12/tests/sys/netpfil/pf/forward.sh (revision 368666) @@ -1,157 +1,149 @@ # $FreeBSD$ . $(atf_get_srcdir)/utils.subr atf_test_case "v4" "cleanup" v4_head() { atf_set descr 'Basic forwarding test' atf_set require.user root # We need scapy to be installed for out test scripts to work atf_set require.progs scapy } v4_body() { - if [ `uname -p` = "i386" ]; then - atf_skip "https://bugs.freebsd.org/239380" - fi - pft_init epair_send=$(vnet_mkepair) ifconfig ${epair_send}a 192.0.2.1/24 up epair_recv=$(vnet_mkepair) ifconfig ${epair_recv}a up vnet_mkjail alcatraz ${epair_send}b ${epair_recv}b jexec alcatraz ifconfig ${epair_send}b 192.0.2.2/24 up jexec alcatraz ifconfig ${epair_recv}b 198.51.100.2/24 up jexec alcatraz sysctl net.inet.ip.forwarding=1 jexec alcatraz arp -s 198.51.100.3 00:01:02:03:04:05 route add -net 198.51.100.0/24 192.0.2.2 # Sanity check, can we forward ICMP echo requests without pf? atf_check -s exit:0 $(atf_get_srcdir)/pft_ping.py \ --sendif ${epair_send}a \ --to 198.51.100.3 \ --recvif ${epair_recv}a jexec alcatraz pfctl -e # Forward with pf enabled pft_set_rules alcatraz "block in" atf_check -s exit:1 $(atf_get_srcdir)/pft_ping.py \ --sendif ${epair_send}a \ --to 198.51.100.3 \ --recvif ${epair_recv}a pft_set_rules alcatraz "block out" atf_check -s exit:1 $(atf_get_srcdir)/pft_ping.py \ --sendif ${epair_send}a \ --to 198.51.100.3 \ --recv ${epair_recv}a # Allow ICMP pft_set_rules alcatraz "block in" "pass in proto icmp" atf_check -s exit:0 $(atf_get_srcdir)/pft_ping.py \ --sendif ${epair_send}a \ --to 198.51.100.3 \ --recvif ${epair_recv}a } v4_cleanup() { pft_cleanup } atf_test_case "v6" "cleanup" v6_head() { atf_set descr 'Basic IPv6 forwarding test' atf_set require.user root atf_set require.progs scapy } v6_body() { - if [ `uname -p` = "i386" ]; then - atf_skip "https://bugs.freebsd.org/239380" - fi - pft_init epair_send=$(vnet_mkepair) epair_recv=$(vnet_mkepair) ifconfig ${epair_send}a inet6 2001:db8:42::1/64 up no_dad -ifdisabled ifconfig ${epair_recv}a up vnet_mkjail alcatraz ${epair_send}b ${epair_recv}b jexec alcatraz ifconfig ${epair_send}b inet6 2001:db8:42::2/64 up no_dad jexec alcatraz ifconfig ${epair_recv}b inet6 2001:db8:43::2/64 up no_dad jexec alcatraz sysctl net.inet6.ip6.forwarding=1 jexec alcatraz ndp -s 2001:db8:43::3 00:01:02:03:04:05 route add -6 2001:db8:43::/64 2001:db8:42::2 # Sanity check, can we forward ICMP echo requests without pf? atf_check -s exit:0 $(atf_get_srcdir)/pft_ping.py \ --ip6 \ --sendif ${epair_send}a \ --to 2001:db8:43::3 \ --recvif ${epair_recv}a jexec alcatraz pfctl -e # Block incoming echo request packets pft_set_rules alcatraz \ "block in inet6 proto icmp6 icmp6-type echoreq" atf_check -s exit:1 $(atf_get_srcdir)/pft_ping.py \ --ip6 \ --sendif ${epair_send}a \ --to 2001:db8:43::3 \ --recvif ${epair_recv}a # Block outgoing echo request packets pft_set_rules alcatraz \ "block out inet6 proto icmp6 icmp6-type echoreq" atf_check -s exit:1 -e ignore $(atf_get_srcdir)/pft_ping.py \ --ip6 \ --sendif ${epair_send}a \ --to 2001:db8:43::3 \ --recvif ${epair_recv}a # Allow ICMPv6 but nothing else pft_set_rules alcatraz \ "block out" \ "pass out inet6 proto icmp6" atf_check -s exit:0 $(atf_get_srcdir)/pft_ping.py \ --ip6 \ --sendif ${epair_send}a \ --to 2001:db8:43::3 \ --recvif ${epair_recv}a # Allowing ICMPv4 does not allow ICMPv6 pft_set_rules alcatraz \ "block out inet6 proto icmp6 icmp6-type echoreq" \ "pass in proto icmp" atf_check -s exit:1 $(atf_get_srcdir)/pft_ping.py \ --ip6 \ --sendif ${epair_send}a \ --to 2001:db8:43::3 \ --recvif ${epair_recv}a } v6_cleanup() { pft_cleanup } atf_init_test_cases() { atf_add_test_case "v4" atf_add_test_case "v6" } Index: stable/12/tests/sys/netpfil/pf/names.sh =================================================================== --- stable/12/tests/sys/netpfil/pf/names.sh (revision 368665) +++ stable/12/tests/sys/netpfil/pf/names.sh (revision 368666) @@ -1,35 +1,34 @@ # $FreeBSD$ . $(atf_get_srcdir)/utils.subr atf_test_case "names" "cleanup" names_head() { atf_set descr 'Test overlapping names' atf_set require.user root } names_body() { - atf_skip "Kernel panics when flushing epair queue (bug238870)" pft_init epair=$(vnet_mkepair) vnet_mkjail alcatraz ${epair}b ifconfig ${epair}a name foo jexec alcatraz ifconfig ${epair}b name foo jail -r alcatraz ifconfig foo destroy } names_cleanup() { pft_cleanup } atf_init_test_cases() { atf_add_test_case "names" } Index: stable/12/tests/sys/netpfil/pf/nat.sh =================================================================== --- stable/12/tests/sys/netpfil/pf/nat.sh (revision 368665) +++ stable/12/tests/sys/netpfil/pf/nat.sh (revision 368666) @@ -1,68 +1,64 @@ # $FreeBSD$ . $(atf_get_srcdir)/utils.subr atf_test_case "exhaust" "cleanup" exhaust_head() { atf_set descr 'Test exhausting the NAT pool' atf_set require.user root } exhaust_body() { - if [ "$(atf_config_get ci false)" = "true" ]; then - atf_skip "https://bugs.freebsd.org/244703" - fi - pft_init epair_nat=$(vnet_mkepair) epair_echo=$(vnet_mkepair) vnet_mkjail nat ${epair_nat}b ${epair_echo}a vnet_mkjail echo ${epair_echo}b ifconfig ${epair_nat}a 192.0.2.2/24 up route add -net 198.51.100.0/24 192.0.2.1 jexec nat ifconfig ${epair_nat}b 192.0.2.1/24 up jexec nat ifconfig ${epair_echo}a 198.51.100.1/24 up jexec nat sysctl net.inet.ip.forwarding=1 jexec echo ifconfig ${epair_echo}b 198.51.100.2/24 up jexec echo /usr/sbin/inetd $(atf_get_srcdir)/echo_inetd.conf # Enable pf! jexec nat pfctl -e pft_set_rules nat \ "nat pass on ${epair_echo}a inet from 192.0.2.0/24 to any -> (${epair_echo}a) port 30000:30001 sticky-address" # Sanity check atf_check -s exit:0 -o ignore ping -c 3 198.51.100.2 echo "foo" | nc -N 198.51.100.2 7 echo "foo" | nc -N 198.51.100.2 7 # This one will fail, but that's expected echo "foo" | nc -N 198.51.100.2 7 & sleep 1 # If the kernel is stuck in pf_get_sport() this will not succeed either. timeout 2 jexec nat pfctl -sa if [ $? -eq 124 ]; then # Timed out atf_fail "pfctl timeout" fi } exhaust_cleanup() { pft_cleanup } atf_init_test_cases() { atf_add_test_case "exhaust" } Index: stable/12/tests/sys/netpfil/pf/set_tos.sh =================================================================== --- stable/12/tests/sys/netpfil/pf/set_tos.sh (revision 368665) +++ stable/12/tests/sys/netpfil/pf/set_tos.sh (revision 368666) @@ -1,97 +1,93 @@ # $FreeBSD$ . $(atf_get_srcdir)/utils.subr atf_test_case "v4" "cleanup" v4_head() { atf_set descr 'set-tos test' atf_set require.user root # We need scapy to be installed for out test scripts to work atf_set require.progs scapy } v4_body() { - if [ `uname -p` = "i386" ]; then - atf_skip "https://bugs.freebsd.org/239380" - fi - pft_init epair_send=$(vnet_mkepair) ifconfig ${epair_send}a 192.0.2.1/24 up epair_recv=$(vnet_mkepair) ifconfig ${epair_recv}a up vnet_mkjail alcatraz ${epair_send}b ${epair_recv}b jexec alcatraz ifconfig ${epair_send}b 192.0.2.2/24 up jexec alcatraz ifconfig ${epair_recv}b 198.51.100.2/24 up jexec alcatraz sysctl net.inet.ip.forwarding=1 jexec alcatraz arp -s 198.51.100.3 00:01:02:03:04:05 route add -net 198.51.100.0/24 192.0.2.2 jexec alcatraz pfctl -e # No change is done if not requested pft_set_rules alcatraz "scrub out proto icmp" atf_check -s exit:1 -o ignore $(atf_get_srcdir)/pft_ping.py \ --sendif ${epair_send}a \ --to 198.51.100.3 \ --recvif ${epair_recv}a \ --expect-tos 42 # The requested ToS is set pft_set_rules alcatraz "scrub out proto icmp set-tos 42" atf_check -s exit:0 $(atf_get_srcdir)/pft_ping.py \ --sendif ${epair_send}a \ --to 198.51.100.3 \ --recvif ${epair_recv}a \ --expect-tos 42 # ToS is not changed if the scrub rule does not match pft_set_rules alcatraz "scrub out proto tcp set-tos 42" atf_check -s exit:1 -o ignore $(atf_get_srcdir)/pft_ping.py \ --sendif ${epair_send}a \ --to 198.51.100.3 \ --recvif ${epair_recv}a \ --expect-tos 42 # Multiple scrub rules match as expected pft_set_rules alcatraz "scrub out proto tcp set-tos 13" \ "scrub out proto icmp set-tos 14" atf_check -s exit:0 $(atf_get_srcdir)/pft_ping.py \ --sendif ${epair_send}a \ --to 198.51.100.3 \ --recvif ${epair_recv}a \ --expect-tos 14 # And this works even if the packet already has ToS values set atf_check -s exit:0 $(atf_get_srcdir)/pft_ping.py \ --sendif ${epair_send}a \ --to 198.51.100.3 \ --recvif ${epair_recv}a \ --send-tos 42 \ --expect-tos 14 # ToS values are unmolested if the packets do not match a scrub rule pft_set_rules alcatraz "scrub out proto tcp set-tos 13" atf_check -s exit:0 $(atf_get_srcdir)/pft_ping.py \ --sendif ${epair_send}a \ --to 198.51.100.3 \ --recvif ${epair_recv}a \ --send-tos 42 \ --expect-tos 42 } v4_cleanup() { pft_cleanup } atf_init_test_cases() { atf_add_test_case "v4" } Index: stable/12/tests/sys/netpfil/pf/synproxy.sh =================================================================== --- stable/12/tests/sys/netpfil/pf/synproxy.sh (revision 368665) +++ stable/12/tests/sys/netpfil/pf/synproxy.sh (revision 368666) @@ -1,60 +1,59 @@ # $FreeBSD$ . $(atf_get_srcdir)/utils.subr atf_test_case "synproxy" "cleanup" synproxy_head() { atf_set descr 'Basic synproxy test' atf_set require.user root } synproxy_body() { - atf_skip "Kernel panics when flushing epair queue (bug238870)" pft_init epair=$(vnet_mkepair) ifconfig ${epair}a 192.0.2.1/24 up route add -net 198.51.100.0/24 192.0.2.2 link=$(vnet_mkepair) vnet_mkjail alcatraz ${epair}b ${link}a jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up jexec alcatraz ifconfig ${link}a 198.51.100.1/24 up jexec alcatraz sysctl net.inet.ip.forwarding=1 vnet_mkjail singsing ${link}b jexec singsing ifconfig ${link}b 198.51.100.2/24 up jexec singsing route add default 198.51.100.1 jexec singsing /usr/sbin/inetd $(atf_get_srcdir)/echo_inetd.conf jexec alcatraz pfctl -e pft_set_rules alcatraz "set fail-policy return" \ "scrub in all fragment reassemble" \ "pass out quick on ${epair}b all no state allow-opts" \ "pass in quick on ${epair}b proto tcp from any to any port 7 synproxy state" \ "pass in quick on ${epair}b all no state" # Sanity check, can we ping singing atf_check -s exit:0 -o ignore ping -c 1 198.51.100.2 # Check that we can talk to the singsing jail, after synproxying reply=$(echo ping | nc -N 198.51.100.2 7) if [ "${reply}" != "ping" ]; then atf_fail "echo failed" fi } synproxy_cleanup() { pft_cleanup } atf_init_test_cases() { atf_add_test_case "synproxy" } Index: stable/12 =================================================================== --- stable/12 (revision 368665) +++ stable/12 (revision 368666) Property changes on: stable/12 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r368239