From owner-dev-commits-src-branches@freebsd.org Tue Sep 14 20:01:39 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C93CA66FF19; Tue, 14 Sep 2021 20:01:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H8Dkq2X3Tz4pqv; Tue, 14 Sep 2021 20:01:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 71A7020A37; Tue, 14 Sep 2021 20:01:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18EK1buN089662; Tue, 14 Sep 2021 20:01:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18EK1bXe089661; Tue, 14 Sep 2021 20:01:37 GMT (envelope-from git) Date: Tue, 14 Sep 2021 20:01:37 GMT Message-Id: <202109142001.18EK1bXe089661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: cacf2d4beb4e - stable/12 - netpfil tests: Add the set ToS test for ipfw and pf MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: cacf2d4beb4e50fe636133ae1e2709537a560475 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2021 20:01:40 -0000 The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=cacf2d4beb4e50fe636133ae1e2709537a560475 commit cacf2d4beb4e50fe636133ae1e2709537a560475 Author: Kristof Provost AuthorDate: 2019-08-20 14:31:22 +0000 Commit: Kristof Provost CommitDate: 2021-09-14 08:28:00 +0000 netpfil tests: Add the set ToS test for ipfw and pf This test tests the following: - The firewall is able to set the tos bits - The firewall is able to set the DSCP bits when EN bits is already set and the EN bits remains unchanged. - The firewall is able to drop the packets based on ToS value Submitted by: Ahsan Barkati Reviewed by: kp Sponsored by: Google, Inc. (GSoC 2019) Differential Revision: https://reviews.freebsd.org/D21305 (cherry picked from commit df3d236d96456f1c8400c7898045eae3ea93232d) --- tests/sys/netpfil/common/Makefile | 3 +- tests/sys/netpfil/common/tos.sh | 118 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 1 deletion(-) diff --git a/tests/sys/netpfil/common/Makefile b/tests/sys/netpfil/common/Makefile index 9e1efc924c6e..7ce47dd7c9b0 100644 --- a/tests/sys/netpfil/common/Makefile +++ b/tests/sys/netpfil/common/Makefile @@ -6,7 +6,8 @@ TESTSDIR= ${TESTSBASE}/sys/netpfil/common ATF_TESTS_SH+= \ nat \ - pass_block + pass_block \ + tos ${PACKAGE}FILES+= \ pft_ping.py \ diff --git a/tests/sys/netpfil/common/tos.sh b/tests/sys/netpfil/common/tos.sh new file mode 100644 index 000000000000..452c6a002bbf --- /dev/null +++ b/tests/sys/netpfil/common/tos.sh @@ -0,0 +1,118 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright (c) 2019 Ahsan Barkati +# +# 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. +# +# $FreeBSD$ +# + +. $(atf_get_srcdir)/utils.subr +. $(atf_get_srcdir)/runner.subr + +tos_head() +{ + atf_set descr 'set-tos test' + atf_set require.user root + atf_set require.progs scapy +} + +tos_body() +{ + firewall=$1 + firewall_init $firewall + + 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 iron ${epair_send}b ${epair_recv}b + jexec iron ifconfig ${epair_send}b 192.0.2.2/24 up + jexec iron ifconfig ${epair_recv}b 198.51.100.2/24 up + jexec iron sysctl net.inet.ip.forwarding=1 + jexec iron arp -s 198.51.100.3 00:01:02:03:04:05 + route add -net 198.51.100.0/24 192.0.2.2 + + # Check if the firewall is able to set the ToS bits + firewall_config "iron" ${firewall} \ + "pf" \ + "scrub out proto icmp set-tos 36" \ + "ipfw" \ + "ipfw -q add 100 setdscp 9 ip from any to any" + # dscp is set to 9 because last two bits are for + # EN and hence tos would be 36 + + 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 36 + + # Check if the firewall is able to set the ToS bits + # and persists the EN bits (if already set) + firewall_config "iron" ${firewall} \ + "pf" \ + "scrub out proto icmp set-tos 36" \ + "ipfw" \ + "ipfw -q add 100 setdscp 9 ip from any to any" + + 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 3 \ + --expect-tos 39 + + # Check if the firewall is able to filter the + # packets based on the ToS value + firewall_config "iron" ${firewall} \ + "pf" \ + "block all tos 36" \ + "ipfw" \ + "ipfw -q add 100 deny all from any to any dscp 9" + + atf_check -s exit:1 $(atf_get_srcdir)/pft_ping.py \ + --sendif ${epair_send}a \ + --to 198.51.100.3 \ + --recvif ${epair_recv}a \ + --send-tos 36 + + 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 32 +} + +tos_cleanup() +{ + firewall=$1 + firewall_cleanup $firewall +} + +setup_tests \ + "tos" \ + "pf" \ + "ipfw"