From nobody Thu Jan 04 22:08:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T5ghz1Gcpz55Nbp; Thu, 4 Jan 2024 22:08:51 +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 4T5ghy6pJYz4MJ7; Thu, 4 Jan 2024 22:08:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704406131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3g/zalcAiga+jtzyl7dkoGRjfqYFy2qJOXBL6FkMfxY=; b=RTUG2D7mM80OU+MTpOX/TGi+c/MwyPStUW9apCrjXWZ80L5WWzIDTCErbjGRkyQzSMgOv/ TLbzk7LXUVE/YBj5FyKafZZ/fhoDt4ohhQejZATjKtGLXrtdju4NF0LOR0U9nLFV68gRuA IMFv4TLU3luGbMZzAEvFL799lTNQ+AYsFZjPHocihnGEC1Qp9ufD47RIPyQsUy8cmFDSQO 0iSsFdHhtKtQ6LPAf+Ub+EVYajBCxryiYkJrfoVyrSy25lU7vOInOuK7vXOixjztopUymT IMEjNmz2+21sDBUOIHAGqRyzfYt1YieBAmzcc1S0DA0ZVjHwhWPEakPNkAHifg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704406131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3g/zalcAiga+jtzyl7dkoGRjfqYFy2qJOXBL6FkMfxY=; b=BoYQSKAsY91RJ3S+S7oLerTGuBj+lPWMpxytvYEH3xALwJdc6VbOw29SufV4YZ1WK79Fce sHvR6Y0Qpo4FAfXdL4emWxwMXMuZtlODgAFCyDoLVy6d7B42/ATvsOcgl8ryfaVggmX5wy 1Y2sv4esU7S+AgH4+ZAik8iJIfvmFOuUu1kYRBVKKT1sLYzvk+86xV59Bv5OoLvmP6Pg97 gZhJbd5aChj0WMbthj3yuuDLU8/nGF3dyyCwV/ph68gxRU+SxF80WfMXvGXubzbB79IDhz OG7ZBtnZKBK4dMeeHSzInfFdfU5hM9wFSX/T2Rka8Pw7vSKlXBfK/uN52Cwz4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704406131; a=rsa-sha256; cv=none; b=TAQ8dVv0w03KnpYhLkKgOrMl2A7BXbSx8Vpvl5V49OmNNUh8VThO01eUDvRVLIjL1246yP zELKwnSylBlPlZHZj6DGIZrCvI/V1wyblh4V35iaju/g55UL3BLdXdFU0Nb6ffvnzCZlv8 QwjMseAIy60oeE1cIJSqXNYOolK6fr4IMOvr6en1xnXNO7q7FkAd5F0/LJPLLif3AP9tHL lfuXKQWoCrJEZ0z9rC+8XwufCzyqqGZ0BaeUrPjEGQXJzy2BYZ5Ei0wsbqx/7fW0ILKF1f EQ5UkkCYRjL/PaCjKZEFOMaT2jrm0+KHqXenCvo2/Zwm5dXSmgnsBeP6VNYybg== 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 4T5ghy5sYwzX4Y; Thu, 4 Jan 2024 22:08:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 404M8o4T091065; Thu, 4 Jan 2024 22:08:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 404M8oBf091062; Thu, 4 Jan 2024 22:08:50 GMT (envelope-from git) Date: Thu, 4 Jan 2024 22:08:50 GMT Message-Id: <202401042208.404M8oBf091062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 32df0124f467 - main - pf tests: ensure that pflog shows malformed packets as blocked, not passed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/main X-Git-Reftype: branch X-Git-Commit: 32df0124f467eff3e4691090fecb022dbdaa1e25 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=32df0124f467eff3e4691090fecb022dbdaa1e25 commit 32df0124f467eff3e4691090fecb022dbdaa1e25 Author: Kristof Provost AuthorDate: 2024-01-02 15:01:20 +0000 Commit: Kristof Provost CommitDate: 2024-01-04 22:08:08 +0000 pf tests: ensure that pflog shows malformed packets as blocked, not passed Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/common/pft_ping.py | 9 +++- tests/sys/netpfil/pf/Makefile | 1 + tests/sys/netpfil/pf/pflog.sh | 85 ++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) diff --git a/tests/sys/netpfil/common/pft_ping.py b/tests/sys/netpfil/common/pft_ping.py index 1abf4f609832..a24a1e00150a 100644 --- a/tests/sys/netpfil/common/pft_ping.py +++ b/tests/sys/netpfil/common/pft_ping.py @@ -68,7 +68,11 @@ def prepare_ipv4(dst_address, send_params): flags = send_params.get('flags') tos = send_params.get('tc') ttl = send_params.get('hlim') - ip = sp.IP(dst=dst_address) + opt = send_params.get('nop') + options = '' + if opt: + options='\x00' + ip = sp.IP(dst=dst_address, options=options) if src_address: ip.src = src_address if flags: @@ -443,6 +447,8 @@ def parse_args(): help='IPv6 Traffic Class or IPv4 DiffServ / ToS') parser_send.add_argument('--send-tcpopt-unaligned', action='store_true', help='Include unaligned TCP options') + parser_send.add_argument('--send-nop', action='store_true', + help='Include a NOP IPv4 option') # Expectations parser_expect = parser.add_argument_group('Values expected in sniffed packets') @@ -489,6 +495,7 @@ def main(): expect_params['length'] = send_params['length'] send_params['tcpopt_unaligned'] = args.send_tcpopt_unaligned + send_params['nop'] = args.send_nop send_params['src_address'] = args.fromaddr[0] if args.fromaddr else None # We may not have a default route. Tell scapy where to start looking for routes diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 1083f89a5502..5f18d7c5da35 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -24,6 +24,7 @@ ATF_TESTS_SH+= altq \ names \ nat \ pass_block \ + pflog \ pfsync \ prio \ proxy \ diff --git a/tests/sys/netpfil/pf/pflog.sh b/tests/sys/netpfil/pf/pflog.sh new file mode 100644 index 000000000000..75b7c5c217bb --- /dev/null +++ b/tests/sys/netpfil/pf/pflog.sh @@ -0,0 +1,85 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Rubicon Communications, LLC (Netgate) +# +# 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 + +common_dir=$(atf_get_srcdir)/../common + +atf_test_case "malformed" "cleanup" +malformed_head() +{ + atf_set descr 'Test that we do not log malformed packets as passing' + atf_set require.user root + atf_set require.progs scapy +} + +malformed_body() +{ + pflog_init + + epair=$(vnet_mkepair) + + vnet_mkjail srv ${epair}b + jexec srv ifconfig ${epair}b 192.0.2.1/24 up + + vnet_mkjail cl ${epair}a + jexec cl ifconfig ${epair}a 192.0.2.2/24 up + + jexec cl pfctl -e + jexec cl ifconfig pflog0 up + pft_set_rules cl \ + "pass log keep state" + + # Not required, but the 'pf: dropping packet with ip options' kernel log can + # help when debugging the test. + jexec cl pfctl -x loud + + jexec cl tcpdump -n -e -ttt --immediate-mode -l -U -i pflog0 >> pflog.txt & + sleep 1 # Wait for tcpdump to start + + # Sanity check + atf_check -s exit:0 -o ignore \ + jexec srv ping -c 1 192.0.2.2 + + jexec srv ${common_dir}/pft_ping.py \ + --sendif ${epair}b \ + --to 192.0.2.2 \ + --send-nop \ + --recvif ${epair}b + + atf_check -o match:".*rule 0/8\(ip-option\): block in on ${epair}a: 192.0.2.1 > 192.0.2.2: ICMP echo request.*" \ + cat pflog.txt +} + +malformed_cleanup() +{ + pft_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "malformed" +}