From patchwork Sat Dec 18 17:10:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 35391 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 7FB1127BBEA; Sat, 18 Dec 2021 17:11:35 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3779027BBE9 for ; Sat, 18 Dec 2021 17:11:35 +0000 (GMT) Received: from localhost ([::1]:51302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mydF8-0003Oz-Bs for patchwork@mira.cbaines.net; Sat, 18 Dec 2021 12:11:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mydEc-0003Nv-Dr for guix-patches@gnu.org; Sat, 18 Dec 2021 12:11:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60401) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mydEc-0000K1-5C for guix-patches@gnu.org; Sat, 18 Dec 2021 12:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mydEc-0005B9-07 for guix-patches@gnu.org; Sat, 18 Dec 2021 12:11:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52603] [PATCH 1/2] combinators: Add 'define-compile-time-procedure'. References: <20211218170227.19999-1-ludo@gnu.org> In-Reply-To: <20211218170227.19999-1-ludo@gnu.org> Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Dec 2021 17:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52603 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52603@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 52603-submit@debbugs.gnu.org id=B52603.163984745719890 (code B ref 52603); Sat, 18 Dec 2021 17:11:01 +0000 Received: (at 52603) by debbugs.gnu.org; 18 Dec 2021 17:10:57 +0000 Received: from localhost ([127.0.0.1]:43712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mydEX-0005Ak-D0 for submit@debbugs.gnu.org; Sat, 18 Dec 2021 12:10:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38002) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mydEV-0005AO-EZ for 52603@debbugs.gnu.org; Sat, 18 Dec 2021 12:10:56 -0500 Received: from [2001:470:142:3::e] (port=59256 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mydEQ-0000Fx-8E; Sat, 18 Dec 2021 12:10:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=sZPtlVu7O9kWRcWDKdsLxqBQTJwfevg1mscj9qDhRMY=; b=Ni7pyCQaJPlmPd JWNkHS5GWsUcZUDFOyKe3q7aDa2Q6fk0w0bpc+uT2JwFP/JI7zwGuH/YpRlcCTaeMAY4a7bo7Afa7 pFXVaGZAvpBRKrWzFc74qsXWXNFsq8PXbG2uk/Jq2J3yz6QpBo7xOf7R3WaLvGsbadGO5f8yOx6aI GLkZXEqMEJikVWXo4qCrf6TPayuLBLWGBvE264lkLoDJfh9djB0pPVOTXQrVxHhuFtqs2FqnNFQiT epEhxfI+gYerK/+BFhGHs77kiYVjNDohBbyFVyQAFInwZlbXKYIOym8WD25WGFStk24s/HThU3TLX eSxyiHj63jS/F+vyky8g==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:51822 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mydEQ-0007OB-4q; Sat, 18 Dec 2021 12:10:50 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sat, 18 Dec 2021 18:10:39 +0100 Message-Id: <20211218171040.20268-1-ludo@gnu.org> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 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 * guix/combinators.scm (procedure-call-location): New syntax parameter. (define-compile-time-procedure): New macro. --- guix/combinators.scm | 50 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/guix/combinators.scm b/guix/combinators.scm index 88ad09dbe6..261d6bb57e 100644 --- a/guix/combinators.scm +++ b/guix/combinators.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2012-2017, 2021 Ludovic Courtès ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2020 Arun Isaac ;;; @@ -24,7 +24,9 @@ (define-module (guix combinators) #:export (fold2 fold-tree fold-tree-leaves - compile-time-value)) + compile-time-value + procedure-call-location + define-compile-time-procedure)) ;;; Commentary: ;;; @@ -100,4 +102,48 @@ (define-syntax compile-time-value ;not quite at home (_ #`'#,(datum->syntax s val))))))) v)))) +(define-syntax-parameter procedure-call-location + (lambda (s) + (syntax-violation 'procedure-call-location + "'procedure-call-location' may only be used \ +within 'define-compile-time-procedure'" + s))) + +(define-syntax-rule (define-compile-time-procedure (proc (arg pred) ...) + body ...) + "Define PROC as a macro such that, if every actual argument in a \"call\" +matches PRED, then BODY is evaluated at macro-expansion time. BODY must +return a single value in a type that has read syntax--e.g., numbers, strings, +lists, etc. + +BODY can refer to 'procedure-call-location', which is bound to a source +property alist corresponding to the call site. + +This macro is meant to be used primarily for small procedures that validate or +process its arguments in a way that may be equally well performed at +macro-expansion time." + (define-syntax proc + (lambda (s) + (define loc + #`(identifier-syntax + '#,(datum->syntax #'s (syntax-source s)))) + + (syntax-case s () + ((_ arg ...) + (and (pred (syntax->datum #'arg)) ...) + (let ((arg (syntax->datum #'arg)) ...) + (syntax-parameterize ((procedure-call-location + (identifier-syntax (syntax-source s)))) + body ...))) + ((_ actual (... ...)) + #`((lambda (arg ...) + (syntax-parameterize ((procedure-call-location #,loc)) + body ...)) + actual (... ...))) + (id + (identifier? #'id) + #`(lambda (arg ...) + (syntax-parameterize ((procedure-call-location #,loc)) + body ...))))))) + ;;; combinators.scm ends here From patchwork Sat Dec 18 17:10:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 35390 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 7AB8827BBEA; Sat, 18 Dec 2021 17:11:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3574927BBE9 for ; Sat, 18 Dec 2021 17:11:32 +0000 (GMT) Received: from localhost ([::1]:51288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mydF5-0003OL-DF for patchwork@mira.cbaines.net; Sat, 18 Dec 2021 12:11:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mydEc-0003O5-SS for guix-patches@gnu.org; Sat, 18 Dec 2021 12:11:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60402) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mydEc-0000Ko-Ix for guix-patches@gnu.org; Sat, 18 Dec 2021 12:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mydEc-0005BG-El for guix-patches@gnu.org; Sat, 18 Dec 2021 12:11:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52603] [PATCH 2/2] services: static-networking: Sanitize values. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 18 Dec 2021 17:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52603 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52603@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 52603-submit@debbugs.gnu.org id=B52603.163984746019899 (code B ref 52603); Sat, 18 Dec 2021 17:11:02 +0000 Received: (at 52603) by debbugs.gnu.org; 18 Dec 2021 17:11:00 +0000 Received: from localhost ([127.0.0.1]:43714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mydEZ-0005At-O2 for submit@debbugs.gnu.org; Sat, 18 Dec 2021 12:11:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38014) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mydEW-0005AQ-J2 for 52603@debbugs.gnu.org; Sat, 18 Dec 2021 12:10:56 -0500 Received: from [2001:470:142:3::e] (port=59258 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mydER-0000G4-E0; Sat, 18 Dec 2021 12:10:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=WlH2OKxELK+nlVYdV+ZepBgfo/88NxY8B+bHKGcvdcE=; b=kV4Ns5J5qCrXnqD8JtYg U7keJiTYhGPP2zHoR/wkW319HyuTGKP+AMbUTdSi7KPYaqGw4CFLXA2yKMM+JT6zhyHobR3A0E361 W51ivYD+H6EyEBpFgu3e8IivrZatVha+qXBoMzvqWlakh8749oTFT0M2ru8vsGZAB1KUm/5IyiYzq YSe6/V2xvXbq/k0nnYIttpz1KMSNWPgivtLkZmCRdVqgFmjGXxTe3b+jy10xZKIlPnQDpCSyKJFws HsjXWiQQQFy0xWYGtIu1LQHh9Z4e/wOM0tGpIcUllDc5agqvsoMBuQYKTJ5PxKt4QDtVw5ID9uqCu OSXWZxwPG/AQ9w==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:51822 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mydER-0007OB-Be; Sat, 18 Dec 2021 12:10:51 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sat, 18 Dec 2021 18:10:40 +0100 Message-Id: <20211218171040.20268-2-ludo@gnu.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211218171040.20268-1-ludo@gnu.org> References: <20211218171040.20268-1-ludo@gnu.org> MIME-Version: 1.0 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 This makes sure users do not mistakenly configuring a network with "/0" as its netmask. * gnu/services/base.scm (assert-valid-address): New procedure. ()[value]: Add it as 'sanitize'. --- gnu/services/base.scm | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 5f93483dda..49ec856de4 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -35,8 +35,9 @@ (define-module (gnu services base) #:use-module (guix store) #:use-module (guix deprecation) - #:autoload (guix diagnostics) (warning) + #:autoload (guix diagnostics) (warning &fix-hint) #:autoload (guix i18n) (G_) + #:use-module (guix combinators) #:use-module (gnu services) #:use-module (gnu services admin) #:use-module (gnu services shepherd) @@ -72,6 +73,8 @@ (define-module (gnu services base) #:use-module (guix i18n) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:use-module (ice-9 match) #:use-module (ice-9 format) #:re-export (user-processes-service-type ;backwards compatibility @@ -2388,6 +2391,26 @@ (define (ipv6-address? str) "Return true if STR denotes an IPv6 address." (false-if-exception (->bool (inet-pton AF_INET6 str)))) +(define-compile-time-procedure (assert-valid-address (address string?)) + "Ensure ADDRESS has a valid netmask." + (unless (or (cidr->netmask address) + (and=> (false-if-exception (inet-pton AF_INET address)) + (cut = INADDR_LOOPBACK <>)) + (and=> (false-if-exception (inet-pton AF_INET6 address)) + (cut = 1 <>))) + (raise + (make-compound-condition + (formatted-message (G_ "address '~a' lacks a network mask") + address) + (condition (&error-location + (location + (source-properties->location procedure-call-location)))) + (condition (&fix-hint + (hint (format #f (G_ "\ +Write, say, @samp{\"~a/24\"} for a 24-bit network mask.") + address))))))) + address) + (define-record-type* static-networking make-static-networking static-networking? @@ -2405,7 +2428,8 @@ (define-record-type* network-address make-network-address network-address? (device network-address-device) ;string--e.g., "en01" - (value network-address-value) ;string--CIDR notation + (value network-address-value ;string--CIDR notation + (sanitize assert-valid-address)) (ipv6? network-address-ipv6? ;Boolean (thunked) (default