From owner-svn-src-head@freebsd.org Sat Jun 9 17:16:36 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A17DC1011C0F; Sat, 9 Jun 2018 17:16:36 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 77F91741A3; Sat, 9 Jun 2018 14:21:08 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 59FB71F009; Sat, 9 Jun 2018 14:21:08 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w59EL87R015121; Sat, 9 Jun 2018 14:21:08 GMT (envelope-from kp@FreeBSD.org) Received: (from kp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w59EL8Vm015120; Sat, 9 Jun 2018 14:21:08 GMT (envelope-from kp@FreeBSD.org) Message-Id: <201806091421.w59EL8Vm015120@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kp set sender to kp@FreeBSD.org using -f From: Kristof Provost Date: Sat, 9 Jun 2018 14:21:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334877 - head/tests/sys/netpfil/pf X-SVN-Group: head X-SVN-Commit-Author: kp X-SVN-Commit-Paths: head/tests/sys/netpfil/pf X-SVN-Commit-Revision: 334877 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jun 2018 17:16:37 -0000 Author: kp Date: Sat Jun 9 14:21:07 2018 New Revision: 334877 URL: https://svnweb.freebsd.org/changeset/base/334877 Log: pf tests: Basic route-to tests Very basic route-to tests. These tests attempt to provoke PR 228782 for IPv4 and IPv6. A test failure will panic the machine. Added: head/tests/sys/netpfil/pf/route_to.sh (contents, props changed) Modified: head/tests/sys/netpfil/pf/Makefile Modified: head/tests/sys/netpfil/pf/Makefile ============================================================================== --- head/tests/sys/netpfil/pf/Makefile Sat Jun 9 14:17:06 2018 (r334876) +++ head/tests/sys/netpfil/pf/Makefile Sat Jun 9 14:21:07 2018 (r334877) @@ -8,7 +8,8 @@ TESTS_SUBDIRS+= ioctl ATF_TESTS_SH+= pass_block \ forward \ fragmentation \ - set_tos + set_tos \ + route_to ${PACKAGE}FILES+= utils.subr \ pft_ping.py Added: head/tests/sys/netpfil/pf/route_to.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tests/sys/netpfil/pf/route_to.sh Sat Jun 9 14:21:07 2018 (r334877) @@ -0,0 +1,81 @@ +# $FreeBSD$ + +. $(atf_get_srcdir)/utils.subr + +atf_test_case "v4" "cleanup" +v4_head() +{ + atf_set descr 'Basic route-to test' + atf_set require.user root +} + +v4_body() +{ + pft_init + + epair_send=$(pft_mkepair) + ifconfig ${epair_send}a 192.0.2.1/24 up + epair_route=$(pft_mkepair) + ifconfig ${epair_route}a 203.0.113.1/24 up + + pft_mkjail alcatraz ${epair_send}b ${epair_route}b + jexec alcatraz ifconfig ${epair_send}b 192.0.2.2/24 up + jexec alcatraz ifconfig ${epair_route}b 203.0.113.2/24 up + jexec alcatraz route add -net 198.51.100.0/24 192.0.2.1 + jexec alcatraz pfctl -e + + # Attempt to provoke PR 228782 + pft_set_rules alcatraz "block all" "pass user 2" \ + "pass out route-to (${epair_route}b 203.0.113.1) from 192.0.2.2 to 198.51.100.1 no state" + jexec alcatraz nc -w 3 -s 192.0.2.2 198.51.100.1 22 + + # atf wants us to not return an error, but our netcat will fail + true +} + +v4_cleanup() +{ + pft_cleanup +} + +atf_test_case "v6" "cleanup" +v6_head() +{ + atf_set descr 'Basic route-to test (IPv6)' + atf_set require.user root +} + +v6_body() +{ + pft_init + + epair_send=$(pft_mkepair) + ifconfig ${epair_send}a inet6 2001:db8:42::1/64 up no_dad -ifdisabled + epair_route=$(pft_mkepair) + ifconfig ${epair_route}a inet6 2001:db8:43::1/64 up no_dad -ifdisabled + + pft_mkjail alcatraz ${epair_send}b ${epair_route}b + jexec alcatraz ifconfig ${epair_send}b inet6 2001:db8:42::2/64 up no_dad + jexec alcatraz ifconfig ${epair_route}b inet6 2001:db8:43::2/64 up no_dad + jexec alcatraz route add -6 2001:db8:666::/64 2001:db8:42::2 + jexec alcatraz pfctl -e + + # Attempt to provoke PR 228782 + pft_set_rules alcatraz "block all" "pass user 2" \ + "pass out route-to (${epair_route}b 2001:db8:43::1) from 2001:db8:42::2 to 2001:db8:666::1 no state" + jexec alcatraz nc -6 -w 3 -s 2001:db8:42::2 2001:db8:666::1 22 + + # atf wants us to not return an error, but our netcat will fail + true +} + +v6_cleanup() +{ + pft_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "v4" + atf_add_test_case "v6" +}