From unknown Thu Jun 19 14:07:17 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#46185 <46185@debbugs.gnu.org> To: bug#46185 <46185@debbugs.gnu.org> Subject: Status: [PATCH] services: knot: Fix an acl and a key verification. Reply-To: bug#46185 <46185@debbugs.gnu.org> Date: Thu, 19 Jun 2025 21:07:17 +0000 retitle 46185 [PATCH] services: knot: Fix an acl and a key verification. reassign 46185 guix-patches submitter 46185 Alexey Abramov severity 46185 normal tag 46185 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 30 03:19:58 2021 Received: (at submit) by debbugs.gnu.org; 30 Jan 2021 08:19:58 +0000 Received: from localhost ([127.0.0.1]:53601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l5lU5-0008TB-50 for submit@debbugs.gnu.org; Sat, 30 Jan 2021 03:19:58 -0500 Received: from lists.gnu.org ([209.51.188.17]:58242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l5lU0-0008Sx-7P for submit@debbugs.gnu.org; Sat, 30 Jan 2021 03:19:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l5lU0-0007Zj-1W for guix-patches@gnu.org; Sat, 30 Jan 2021 03:19:52 -0500 Received: from mx4.mail.mmer.org ([178.22.66.29]:31965) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l5lTy-0000bC-I7 for guix-patches@gnu.org; Sat, 30 Jan 2021 03:19:51 -0500 Received: from delta (unknown [10.147.19.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx4.mail.mmer.org (Postfix) with ESMTPSA id 97BF79CC4D for ; Sat, 30 Jan 2021 07:49:04 +0000 (UTC) From: Alexey Abramov To: guix-patches@gnu.org Subject: [PATCH] services: knot: Fix an acl and a key verification. Date: Sat, 30 Jan 2021 09:19:32 +0100 Message-Id: <20210130081932.31088-1-levenson@mmer.org> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.22.66.29; envelope-from=levenson@mmer.org; helo=mx4.mail.mmer.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * gnu/services/dns.scm (verify-knot-key-configuration): Change the order of memq attributes. (verify-knot-keystore-configuration): Likewise. (verify-knot-acl-configuration): Replace fold with every procedure. --- gnu/services/dns.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index b339eb0619..d4aefe6285 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -256,9 +256,9 @@ (let ((id (knot-key-configuration-id key))) (unless (and (string? id) (not (equal? id ""))) (error-out "key id must be a non empty string."))) - (unless (memq '(#f hmac-md5 hmac-sha1 hmac-sha224 hmac-sha256 hmac-sha384 hmac-sha512) - (knot-key-configuration-algorithm key)) - (error-out "algorithm must be one of: #f, 'hmac-md5, 'hmac-sha1, + (unless (memq (knot-key-configuration-algorithm key) + '(#f hmac-md5 hmac-sha1 hmac-sha224 hmac-sha256 hmac-sha384 hmac-sha512)) + (error-out "algorithm must be one of: #f, 'hmac-md5, 'hmac-sha1, 'hmac-sha224, 'hmac-sha256, 'hmac-sha384 or 'hmac-sha512"))) (define (verify-knot-keystore-configuration keystore) @@ -267,9 +267,9 @@ (let ((id (knot-keystore-configuration-id keystore))) (unless (and (string? id) (not (equal? id ""))) (error-out "keystore id must be a non empty string."))) - (unless (memq '(pem pkcs11) - (knot-keystore-configuration-backend keystore)) - (error-out "backend must be one of: 'pem or 'pkcs11"))) + (unless (memq (knot-keystore-configuration-backend keystore) + '(pem pkcs11)) + (error-out "backend must be one of: 'pem or 'pkcs11"))) (define (verify-knot-policy-configuration policy) (unless (knot-policy-configuration? policy) @@ -288,7 +288,7 @@ (unless (and (string? id) (not (equal? id ""))) (error-out "acl id must be a non empty string.")) (unless (and (list? address) - (fold (lambda (x1 x2) (and (string? x1) (string? x2))) "" address)) + (every string? address)) (error-out "acl address must be a list of strings."))) (unless (boolean? (knot-acl-configuration-deny? acl)) (error-out "deny? must be #t or #f."))) -- 2.30.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 10 22:16:27 2021 Received: (at 46185-done) by debbugs.gnu.org; 11 Feb 2021 03:16:27 +0000 Received: from localhost ([127.0.0.1]:57541 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lA2Sw-0003DZ-Rc for submit@debbugs.gnu.org; Wed, 10 Feb 2021 22:16:27 -0500 Received: from mail-oln040092253051.outbound.protection.outlook.com ([40.92.253.51]:6179 helo=APC01-SG2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lA2St-0003DJ-Gk for 46185-done@debbugs.gnu.org; Wed, 10 Feb 2021 22:16:24 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=an5+KRGe1OdvQRnQ1SpsQp9f85fSEndbIB+Am5WjdqyRY2Ms8l1Nz74/E/YOICXOtGEXrNAvJKxCUy7AWFCr+L/mqYERLQ/kp6GB+7pxZ+gRlaL4/IRAOrEMMQk+U+V6ypHbI7i2wNfSVjHZhFMxQ63qTR/YfGBK5ddGLqHYFIY6ylQnM83ewSXd0GG03WO33+I1kqQKdPrrLJcf2O7p0N7+nkRCMoMXW31yPKxKnaP4hTQAu1SIkUJqTeA9td8SWWpQgRX6LcVdioYzGwZ0WCYabarQeFwjASOe8zCgFe3pcwgEpsddVTGFEPVx1/B0AQRgcVJO69y5RS6o0sfF2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GjpPpLSTi4fP1F/owahuqfh6fwOtZpPw9NiZxF+isj4=; b=SrD1JPm669vBIDadU82OwYZJtl5h3xJ9tHd5B1zeyMKb0c47UwbrDPl1x7tS7vVpcCIzx2TS8jHmb2DY7Fl07Y07dLCO8+JVCQHmM26y/c4YKrV2t41EEBYyBgAFa1b5R7+5qFl5e/EIVM4J25Y6DpkeimhYCf0CZSXifpSroSTeSenU1pJHsAnJr9NVUL+OpxLh5cGcNXaPe3Y2HeZGKiioDOsOUJ3njGqSSV/p+J7TMIAr4NC5q0SvxW6tjkFwMV6y9xHiL5YU5yMzw0YylOqbcSp3h7rk4DP/4oA5tUbTDGiNNQoiIL8QmHCVdLlk6Gu1RylJ8pVIdv9XezQD4A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GjpPpLSTi4fP1F/owahuqfh6fwOtZpPw9NiZxF+isj4=; b=nM7VPZKVOcZGNbczpST0syzy9n3RsexTuZYYUcSrJwuxjaquCR11ea0QHawue2VRMtT6DTPvB0gAdQL3SUV8LRRId5/XsXCxYhWky4RR83USfwXfGuRsn3rHj0CiHzgM3PHXvP2SWom9LRTEPCnTfh76pNz6ey53k8JE/GSNG4AnU20XyufJxEUvMOADxcIYZyZMuexOJseq5cwgFb9rA3WDRXnzAmXxzts8yXOxj3B7ALuR+LBDvlJCCXKZ2zLDKAAlzEfGcrFNPh2KA7PK+6zj+EKI8FoQH029LGaBHKfZxurHkcFeS7qXnpXB1qLSUWxzUg7kMV8nQfpKAmEz4g== Received: from SG2APC01FT115.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebd::40) by SG2APC01HT018.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebd::247) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.11; Thu, 11 Feb 2021 03:16:13 +0000 Received: from OSZP286MB0664.JPNP286.PROD.OUTLOOK.COM (10.152.250.54) by SG2APC01FT115.mail.protection.outlook.com (10.152.250.215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.25 via Frontend Transport; Thu, 11 Feb 2021 03:16:13 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:CB22D75092DAEC527BF07F5EC79A01E057D6640FEC11ED6DB3D6352227F41EA1; UpperCasedChecksum:7A3E89A28F42E95F5C7E95EED942E08EA179EFF6712BC4F2334F6C93B5DE704D; SizeAsReceived:7543; Count:46 Received: from OSZP286MB0664.JPNP286.PROD.OUTLOOK.COM ([fe80::4987:bbf2:2bff:6b22]) by OSZP286MB0664.JPNP286.PROD.OUTLOOK.COM ([fe80::4987:bbf2:2bff:6b22%5]) with mapi id 15.20.3846.027; Thu, 11 Feb 2021 03:16:13 +0000 From: =?utf-8?B?5a6L5paH5q2m?= To: Alexey Abramov Subject: Re: [bug#46185] [PATCH] services: knot: Fix an acl and a key verification. References: <20210130081932.31088-1-levenson@mmer.org> Date: Thu, 11 Feb 2021 11:17:55 +0800 In-Reply-To: <20210130081932.31088-1-levenson@mmer.org> (Alexey Abramov's message of "Sat, 30 Jan 2021 09:19:32 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) Content-Type: text/plain X-TMN: [7hrJfks68MIhe+XbuslApeMmHc5S3QpsGIu4Y3zYY2b3N2ybfGfdKTp19Bq5awCw] X-ClientProxiedBy: BYAPR07CA0102.namprd07.prod.outlook.com (2603:10b6:a03:12b::43) To OSZP286MB0664.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:ec::11) X-Microsoft-Original-Message-ID: <87h7mji97g.fsf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (2409:8a62:378:f4a0:2f1:f5ff:fe18:6bb) by BYAPR07CA0102.namprd07.prod.outlook.com (2603:10b6:a03:12b::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.25 via Frontend Transport; Thu, 11 Feb 2021 03:16:12 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 1cd6025c-f781-49b0-2a9a-08d8ce3b62e1 X-MS-TrafficTypeDiagnostic: SG2APC01HT018: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rQo0OxdUxLHTmFYWILwSVf1/CoMwIYk6FegbDsO/1NkCILGRRUenZt2e4iXDuK1J2fKpnUxqzOr90A732FtIRgQsQvUWqc163dkPxUmrkxDHkqnSLMaAcsmWtls0fuQjWUzm2111ZR8aOSziDT2XhqJgMee/KVt8d3Py1lLdmcZxNg0VffTlh1KyiB7LmFshXmB1R4lXuDbLBA8vPRS/ZtkgYt1I44211B97cC6JNvLvmCSzo+O16f2synN9Huzi5DHKr6CD1hPboOjKvUPLMIot2LJ3CRn0tHvhZnDbA/s42JYXF2la4/xVqdsx5dpOanJUyJ/IMsncOwj85txDuhM8TxkV4gRPOIqd5JpPbTbEwWQTm3TsKeAsMDPZ4o8wHuuxadnYRMrhHzx7bOCSVg== X-MS-Exchange-AntiSpam-MessageData: A1awGECGIpGuzjRLtvs9BqbAKdT3PIyvpsNqqmzqeHsRoOToqfz2TbFJOlpuxvBqIkKr3crWCaz5WSs9fp4+wB1eDGnqcJDM+/E/IPboMAF3FLPD92qgP+9457UpgfhC/ZOM4JaTxfgbQQFZ08Q6EbJk+/Qr0dRS02a5UeyqXK1aAou1ctVwt9EHQH0PebgBmklaDgUYyzg1D5YWayssvg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1cd6025c-f781-49b0-2a9a-08d8ce3b62e1 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2021 03:16:13.1784 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: SG2APC01FT115.eop-APC01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2APC01HT018 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 46185-done Cc: 46185-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Alexey Abramov writes: > * gnu/services/dns.scm (verify-knot-key-configuration): Change the > order of memq attributes. > (verify-knot-keystore-configuration): Likewise. > (verify-knot-acl-configuration): Replace fold with every procedure. > --- > gnu/services/dns.scm | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > I adjust the commit message a bit and pushed, thank you! From unknown Thu Jun 19 14:07:17 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 11 Mar 2021 12:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator