From nobody Fri Feb 14 15:24:21 2025 X-Original-To: dev-commits-src-main@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 4YvbSP4vQ6z5nFjw; Fri, 14 Feb 2025 15:24:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YvbSP4LdWz3DMT; Fri, 14 Feb 2025 15:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739546661; 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=RCTpEGt7C4aU1d4dpBY4+07+udy8OA2c211gOSni1Rw=; b=S5E+TbCKUfn/n6XrfWxCHyaBWoeAynHyUa+d1gJdHQsjpV7tCzoHmqRley4Kh+bGJdman0 AtvXOFMxnVOlONpA7XsRKdxoCfXf0eQIFe61gI322uvA0Ty/sxfUOwHVIWB9zLOwdwa51p ZGgRdQPDNGUZ28gyxMJCKyFOJUjPWCHtJzeLh6EgcEqMLVUWp+cVY9/aXOz9vwEwUydDnb bc57M6FdNZzScMO45BIA2Y0YJ7yo/T7H0gbhurST5JkHkNN/YXVvvoIeDJFkxOJJJZoejV 5WsYbo2hjssEkfiTgCg7N7rnkhSvb+QyRtdE3kawrE4ql0Jj3nGxs2JHsuTwcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739546661; 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=RCTpEGt7C4aU1d4dpBY4+07+udy8OA2c211gOSni1Rw=; b=lxMVe+YXYhqCbarMN9hTjEo8bKApCx0D4iyTjSDj2q35cH8LlT0tSN0XtGW4f/eoOoiSiF KaUUG3gfxOcAMMYSE6GTst9KzCiTQvkBZ4b0wu6GIoW0sEVycOSXVYLdfznuxigYC36RWp 1O7C6NQcqS81Inh5ezVOIFNmVT3I5Q9KQ8lX7oY7Wq+LKaypWjaOSHi0jRJouglhPSFfrX YRBpCvAQQjChivmVp4Gw4P3lkau7DJgf100uN16nY8DDlr233rTyLUjBYW5qYgZ2K7gFei f16Kil69sCIavqpxcLWIaZTAmp3e90m14eDPyEfIFkYhifLxnPKCWFcIdevEIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739546661; a=rsa-sha256; cv=none; b=umfIQ+iEi+k1dqNL2XNfhHebf8XqQ8eSBs4NSBgAITj+W3QLmXVXPr85MEV6No6itczsjt bO4rnFMf+bybFJmclxgVJCxBE0D0HFc8dVlLYB4G8boRQACVI2sP5RJnfl79Z90ITS0ZJo 385LLlWztw0r4Xew7tswzkIngdAUpddYHYxJbd6tQr5noztqK1Tz6NKNk/iXJQeSpue79S tFSN16fMGyAdZJVVKSSht39U0q0eGOsIBs2FP9eWTUN7j86Ifp7OpeUdzHllfhEObyKiG4 eD85+JhLUcX1wPGOH2PDgMTJNs6z1Aauu1jbHBLQcnur6R5DuLyBU4u2ezauNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YvbSP3hgDzcdh; Fri, 14 Feb 2025 15:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51EFOL4Z089167; Fri, 14 Feb 2025 15:24:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EFOLCU089164; Fri, 14 Feb 2025 15:24:21 GMT (envelope-from git) Date: Fri, 14 Feb 2025 15:24:21 GMT Message-Id: <202502141524.51EFOLCU089164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 685fb4253819 - main - pf: Log the intended action when a NAT rule matches a packet List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 685fb42538199fb03a4cf0f3763c69f146366794 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=685fb42538199fb03a4cf0f3763c69f146366794 commit 685fb42538199fb03a4cf0f3763c69f146366794 Author: Franco Fichtner AuthorDate: 2025-02-14 15:14:27 +0000 Commit: Mark Johnston CommitDate: 2025-02-14 15:24:15 +0000 pf: Log the intended action when a NAT rule matches a packet When a packet matches a binat/nat/rdr rule, pf logs the match. The log metadata includes the rule's action on the packet, e.g., PF_PASS. NAT rules have their own actions: PF_BINAT, PF_NAT, PF_RDR. Before commit 948e8413aba0 ("pflog: pass the action to pflog directly"), pflog_packet() would obtain the action from the rule definition, whereas after that commit the action is passed as a parameter. When a NAT rule matches, we want to log the rule action, but after that commit, PF_PASS is hard-coded. Restore the previous behaviour. Add a regression test which installs a redirect, logs packets matching the redirect rule, and verifies that the corresponding pflog entry includes the correct action. Reviewed by: kp Fixes: 948e8413aba0 ("pflog: pass the action to pflog directly") MFC after: 2 weeks Sponsored by: Klara, Inc. Sponsored by: OPNsense Differential Revision: https://reviews.freebsd.org/D48911 --- sys/netpfil/pf/pf.c | 2 +- tests/sys/netpfil/pf/pflog.sh | 59 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index c5042a7685c2..236e68457e81 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5535,7 +5535,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, KASSERT(nk != NULL, ("%s: null nk", __func__)); if (nr->log) { - PFLOG_PACKET(PF_PASS, PFRES_MATCH, nr, a, + PFLOG_PACKET(nr->action, PFRES_MATCH, nr, a, ruleset, pd, 1); } diff --git a/tests/sys/netpfil/pf/pflog.sh b/tests/sys/netpfil/pf/pflog.sh index 8288d1d263e8..d885364e0df7 100644 --- a/tests/sys/netpfil/pf/pflog.sh +++ b/tests/sys/netpfil/pf/pflog.sh @@ -264,10 +264,69 @@ unspecified_v6_cleanup() pft_cleanup } +atf_test_case "rdr_action" "cleanup" +rdr_head() +{ + atf_set descr 'Ensure that NAT rule actions are logged correctly' + atf_set require.user root +} + +rdr_action_body() +{ + j="pflog:rdr_action" + epair_c=$(vnet_mkepair) + epair_srv=$(vnet_mkepair) + + vnet_mkjail ${j}srv ${epair_srv}a + vnet_mkjail ${j}gw ${epair_srv}b ${epair_c}a + vnet_mkjail ${j}c ${epair_c}b + + jexec ${j}srv ifconfig ${epair_srv}a 198.51.100.1/24 up + # No default route in srv jail, to ensure we're NAT-ing + jexec ${j}gw ifconfig ${epair_srv}b 198.51.100.2/24 up + jexec ${j}gw ifconfig ${epair_c}a 192.0.2.1/24 up + jexec ${j}gw sysctl net.inet.ip.forwarding=1 + jexec ${j}c ifconfig ${epair_c}b 192.0.2.2/24 up + jexec ${j}c route add default 192.0.2.1 + + jexec ${j}gw pfctl -e + jexec ${j}gw ifconfig pflog0 up + pft_set_rules ${j}gw \ + "rdr log on ${epair_srv}b proto tcp from 198.51.100.0/24 to any port 1234 -> 192.0.2.2 port 1234" \ + "block quick inet6" \ + "pass in log" + + jexec ${j}gw tcpdump -n -e -ttt --immediate-mode -l -U -i pflog0 >> ${PWD}/pflog.txt & + sleep 1 # Wait for tcpdump to start + + # send a SYN to catch in the log + jexec ${j}srv nc -N -w 0 198.51.100.2 1234 + + echo "Log" + cat ${PWD}/pflog.txt + + # log line generated for rdr hit (pre-NAT) + atf_check -o match:".*.*rule 0/0\(match\): rdr in on ${epair_srv}b: 198.51.100.1.[0-9]* > 198.51.100.2.1234: Flags \[S\].*" \ + cat pflog.txt + + # log line generated for pass hit (post-NAT) + atf_check -o match:".*.*rule 1/0\(match\): pass in on ${epair_srv}b: 198.51.100.1.[0-9]* > 192.0.2.2.1234: Flags \[S\].*" \ + cat pflog.txt + + # only two log lines shall be written + atf_check -o match:2 grep -c . pflog.txt +} + +rdr_action_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "malformed" atf_add_test_case "matches" + atf_add_test_case "rdr_action" atf_add_test_case "state_max" atf_add_test_case "unspecified_v4" atf_add_test_case "unspecified_v6"