From nobody Thu Mar 24 13:14:41 2022 X-Original-To: dev-commits-src-branches@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 7ED921A38D51; Thu, 24 Mar 2022 13:14:42 +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 4KPQg54jFnz3Mb0; Thu, 24 Mar 2022 13:14:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648127681; 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=E+EqANk3kHfcupj4U8YXRlRxr6GssVlKcpa4GzJUZGA=; b=Rv5Md5FHbdlkTd2ds2rbpLgWAhreF86gmqgFRg5K7jRPeIg+uDR2+3nRkhl1j2cyphtgJ8 xmbG0TXPc1r8o5sK9rDSWSuooXVIbOw46HjX6qhZLmRFG5uNNmMgvjtkoS2q/5OvFTN3us vZ4+W7aud87E0JrtJ5OOmE1SRb7/e4SNvskGhNsfxLevHV8gGp3KuxjlUTXRbjKPzH7Ztn tq5EdfKel5c8RlB4Nyw5pPzWA/aGqdvVnWjzkpXag3+RHQIUu3hU/FcluHFzJaXEov8Tqm Z5lByX5zi6gyxU4rCrPs7IcEQ+W89cBsEupPWJSh6EkDAPuz0khMLXgdXLdD0w== 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 7AF291890E; Thu, 24 Mar 2022 13:14:41 +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 22ODEfog032098; Thu, 24 Mar 2022 13:14:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22ODEfoW032097; Thu, 24 Mar 2022 13:14:41 GMT (envelope-from git) Date: Thu, 24 Mar 2022 13:14:41 GMT Message-Id: <202203241314.22ODEfoW032097@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: bba7b182798f - stable/12 - pf tests: Test retrieving nested nat-anchors List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/12 X-Git-Reftype: branch X-Git-Commit: bba7b182798fa4439364a66d8f6f7c0be2723033 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648127681; 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=E+EqANk3kHfcupj4U8YXRlRxr6GssVlKcpa4GzJUZGA=; b=Aib5xYn4xFSB2GPS/tc+ij3Y7AW2U3wqwLsBNS4C0FUaBcHNqD0rhyk64MpTCaHecIQO0E Wi0hrQAGUx0FjltwmoGPyWk8PxCTRemtYOsYwebPFhWtBxaxb2X4kXQg8mZ9CvOr08O1Bb eEnUO9Iwl/LXWm0eqwGhyVefXo7PZXefWWEkoeVBmXuP1m7P8KHAal61UaCdlmjmE/uBOH am0+m3wdpSSRmsBL9aTI9tntN5cBkmVy/mkQutQnLiiLw9SwjvyMJ4t0YOvtmsnMk4XiLC u10FnAiluPQuiyahIGu2Pf9AigHMKJruXuawlB7KLY6S2QHqgMnaRR+mGfZbyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648127681; a=rsa-sha256; cv=none; b=icazJmXl6xPkcbYpymnlYDgDqywzBffzkoDIZH0QimXv1bjff9fECbogTcMc6aojZ9EvS4 5Q26sE53jTxUWOWccl4yaHJw5BZpjIttUs/RC/FLg7rJOovYyNd547ej40Fdk9BSIvp2Hp iZjfXLiidRi0VwyX+ARGJYC6AK0DWt/Z7eXwCfegaS1lwS46AuaWlCENXe251oTb8wtSwB hsxpVMRMtsdqb9H/a1ewrCXDgAZud7mt2bh4SW7pqATbXq++DUp3yGxKdMC9rae9dNq22A 56HkoRpdB2CwVyN1OssZ4zzjNizzkHayo18Ta3LqBjN2neJoTkM7+ZNMjlsB0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=bba7b182798fa4439364a66d8f6f7c0be2723033 commit bba7b182798fa4439364a66d8f6f7c0be2723033 Author: Kristof Provost AuthorDate: 2022-03-17 17:33:50 +0000 Commit: Kristof Provost CommitDate: 2022-03-24 09:44:53 +0000 pf tests: Test retrieving nested nat-anchors MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 3c3a19d1f42af049e798b193d4fd2a872c7c8fec) --- tests/sys/netpfil/pf/nat.sh | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh index 3fabb32db80f..a957dfd59c78 100755 --- a/tests/sys/netpfil/pf/nat.sh +++ b/tests/sys/netpfil/pf/nat.sh @@ -84,7 +84,43 @@ exhaust_cleanup() pft_cleanup } +atf_test_case "nested_anchor" "cleanup" +nested_anchor_head() +{ + atf_set descr 'Test setting and retrieving nested nat anchors' + atf_set require.user root +} + +nested_anchor_body() +{ + pft_init + + epair=$(vnet_mkepair) + + vnet_mkjail nat ${epair}a + + pft_set_rules nat \ + "nat-anchor \"foo\"" + + echo "nat-anchor \"bar\"" | jexec nat pfctl -g -a foo -f - + echo "nat on ${epair}a from any to any -> (${epair}a)" | jexec nat pfctl -g -a "foo/bar" -f - + + atf_check -s exit:0 -o inline:"nat-anchor \"foo\" all { + nat-anchor \"bar\" all { + nat on ${epair}a all -> (${epair}a) round-robin + } +} +" jexec nat pfctl -sn -a "*" + +} + +nested_anchor_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "exhaust" + atf_add_test_case "nested_anchor" }