From patchwork Mon Jul 12 21:08:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 31365 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E184327BC83; Mon, 12 Jul 2021 22:09:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A4C0827BC81 for ; Mon, 12 Jul 2021 22:09:10 +0100 (BST) Received: from localhost ([::1]:38010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m33Ar-00087x-PH for patchwork@mira.cbaines.net; Mon, 12 Jul 2021 17:09:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m33Ak-00087S-JL for guix-patches@gnu.org; Mon, 12 Jul 2021 17:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m33Ak-0006L2-Bs for guix-patches@gnu.org; Mon, 12 Jul 2021 17:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m33Ak-00021l-8B for guix-patches@gnu.org; Mon, 12 Jul 2021 17:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49540] [PATCH 1/2] services: nftables: Only manage delete our own table. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Jul 2021 21:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49540 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49540@debbugs.gnu.org Cc: iyzsong@member.fsf.org, solene@perso.pw X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16261241187756 (code B ref -1); Mon, 12 Jul 2021 21:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jul 2021 21:08:38 +0000 Received: from localhost ([127.0.0.1]:38965 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m33AI-00020w-3J for submit@debbugs.gnu.org; Mon, 12 Jul 2021 17:08:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:53668) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m33AF-00020i-Fp for submit@debbugs.gnu.org; Mon, 12 Jul 2021 17:08:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m33AF-00083S-As for guix-patches@gnu.org; Mon, 12 Jul 2021 17:08:31 -0400 Received: from relay10.mail.gandi.net ([217.70.178.230]:33731) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m33AD-0005xc-I2 for guix-patches@gnu.org; Mon, 12 Jul 2021 17:08:31 -0400 Received: (Authenticated sender: brice@waegenei.re) by relay10.mail.gandi.net (Postfix) with ESMTPSA id C841F240003; Mon, 12 Jul 2021 21:08:26 +0000 (UTC) From: Brice Waegeneire Date: Mon, 12 Jul 2021 23:08:22 +0200 Message-Id: <20210712210823.16987-1-brice@waegenei.re> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210712210543.16598-1-brice@waegenei.re> References: <20210712210543.16598-1-brice@waegenei.re> MIME-Version: 1.0 Received-SPF: pass client-ip=217.70.178.230; envelope-from=brice@waegenei.re; helo=relay10.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/services/networking.scm (%default-nftables-ruleset): Rename table from "forward" to "guix". Clear table before applying before setting it up. (nftables-shepherd-service): Don't flush all the table, just delete our own. --- gnu/services/networking.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 1ae58041d3..3058c14caf 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2019, 2021 Maxim Cournoyer ;;; Copyright © 2019 Sou Bunnbu ;;; Copyright © 2019 Alex Griffin -;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2021 Oleg Pykhalov ;;; Copyright © 2021 Christopher Lemmer Webber ;;; Copyright © 2021 Maxime Devos @@ -1717,7 +1717,12 @@ COMMIT (define %default-nftables-ruleset (plain-file "nftables.conf" "# A simple and safe firewall -table inet filter { + +# Start with our table clean of previous state +add table inet guix +delete table inet guix + +table inet guix { chain input { type filter hook input priority 0; policy drop; @@ -1768,7 +1773,7 @@ table inet filter { (start #~(lambda _ (invoke #$nft "--file" #$ruleset))) (stop #~(lambda _ - (invoke #$nft "flush" "ruleset")))))))) + (invoke #$nft "delete" "table" "inet" "guix")))))))) (define nftables-service-type (service-type From patchwork Mon Jul 12 21:08:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 31366 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 40BC227BC83; Mon, 12 Jul 2021 22:09:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 04A7D27BC81 for ; Mon, 12 Jul 2021 22:09:11 +0100 (BST) Received: from localhost ([::1]:38012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m33As-000887-2d for patchwork@mira.cbaines.net; Mon, 12 Jul 2021 17:09:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m33Ak-00087a-VI for guix-patches@gnu.org; Mon, 12 Jul 2021 17:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55655) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m33Ak-0006L8-O6 for guix-patches@gnu.org; Mon, 12 Jul 2021 17:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m33Ak-00021t-Kb for guix-patches@gnu.org; Mon, 12 Jul 2021 17:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49540] [PATCH 2/2] services: nftables: Make it extendable. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Jul 2021 21:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49540 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49540@debbugs.gnu.org Cc: iyzsong@member.fsf.org, solene@perso.pw X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16261241187762 (code B ref -1); Mon, 12 Jul 2021 21:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jul 2021 21:08:38 +0000 Received: from localhost ([127.0.0.1]:38967 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m33AM-000213-8K for submit@debbugs.gnu.org; Mon, 12 Jul 2021 17:08:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:53672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m33AG-00020k-H8 for submit@debbugs.gnu.org; Mon, 12 Jul 2021 17:08:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m33AG-00083X-7Z for guix-patches@gnu.org; Mon, 12 Jul 2021 17:08:32 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:48859) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m33AD-0005yB-ND for guix-patches@gnu.org; Mon, 12 Jul 2021 17:08:31 -0400 Received: (Authenticated sender: brice@waegenei.re) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id CF855E0003; Mon, 12 Jul 2021 21:08:27 +0000 (UTC) From: Brice Waegeneire Date: Mon, 12 Jul 2021 23:08:23 +0200 Message-Id: <20210712210823.16987-2-brice@waegenei.re> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210712210543.16598-1-brice@waegenei.re> References: <20210712210543.16598-1-brice@waegenei.re> MIME-Version: 1.0 Received-SPF: pass client-ip=217.70.183.196; envelope-from=brice@waegenei.re; helo=relay4-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/services/networking.scm (%default-nftables-rules): New variable… (define-record-type): …replace %default-nftables-ruleset with it. (%default-nftables-ruleset): Deprecate it. (nftables-ruleset): New procedure… (nftables-shepherd-service): …use it. (nftables-service-type): Make it extendable. --- gnu/services/networking.scm | 40 ++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 3058c14caf..53c06dcfed 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -1714,9 +1714,8 @@ COMMIT ;;; nftables ;;; -(define %default-nftables-ruleset - (plain-file "nftables.conf" - "# A simple and safe firewall +(define %default-nftables-rules + "# A simple and safe firewall # Start with our table clean of previous state add table inet guix @@ -1752,7 +1751,11 @@ table inet guix { type filter hook output priority 0; policy accept; } } -")) +") + +(define-deprecated %default-nftables-ruleset + %default-nftables-rules + (plain-file "nftables.conf" %default-nftables-rules)) (define-record-type* nftables-configuration @@ -1760,13 +1763,28 @@ table inet guix { nftables-configuration? (package nftables-configuration-package (default nftables)) - (ruleset nftables-configuration-ruleset ; file-like object - (default %default-nftables-ruleset))) + ; file-like object | list of strings and file-like objects + (ruleset nftables-configuration-ruleset + (default (list %default-nftables-rules)))) + +(define (nftables-ruleset ruleset) + (if (file-like? ruleset) + ruleset + (apply mixed-text-file + `("nftables.conf" + ,@(fold-right + (lambda (rule result) + (if (file-like? rule) + (append (list "include \"" rule "\"\n") result) + (append (list rule "\n") result))) + '() + ruleset))))) (define nftables-shepherd-service (match-lambda (($ package ruleset) - (let ((nft (file-append package "/sbin/nft"))) + (let ((nft (file-append package "/sbin/nft")) + (ruleset (nftables-ruleset ruleset))) (shepherd-service (documentation "Packet filtering and classification") (provision '(nftables)) @@ -1785,6 +1803,14 @@ table inet guix { (compose list nftables-shepherd-service)) (service-extension profile-service-type (compose list nftables-configuration-package)))) + (compose concatenate) + (extend (lambda (config additional-rules) + (let ((ruleset (nftables-configuration-ruleset config))) + (nftables-configuration + (inherit config) + (ruleset (if (list? ruleset) + (append ruleset additional-rules) + (cons* ruleset additional-rules))))))) (default-value (nftables-configuration))))