From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id EH2oLvTc8V9yPwAA0tVLHw (envelope-from ) for ; Sun, 03 Jan 2021 15:04:20 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id uKk3KvTc8V9iXgAAB5/wlQ (envelope-from ) for ; Sun, 03 Jan 2021 15:04:20 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3933C9404E4 for ; Sun, 3 Jan 2021 15:04:20 +0000 (UTC) Received: from localhost ([::1]:49310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kw4vb-0001GG-5f for larch@yhetil.org; Sun, 03 Jan 2021 10:04:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52476) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kw4vM-0001G6-9M for guix-patches@gnu.org; Sun, 03 Jan 2021 10:04:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55002) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kw4vK-0008C6-Mr for guix-patches@gnu.org; Sun, 03 Jan 2021 10:04:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kw4vK-0003tm-IY for guix-patches@gnu.org; Sun, 03 Jan 2021 10:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45409] [PATCH 1/3] guix: Move narinfo code from substitute script to module. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 03 Jan 2021 15:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45409 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines Received: via spool by 45409-submit@debbugs.gnu.org id=B45409.160968619614934 (code B ref 45409); Sun, 03 Jan 2021 15:04:02 +0000 Received: (at 45409) by debbugs.gnu.org; 3 Jan 2021 15:03:16 +0000 Received: from localhost ([127.0.0.1]:38315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kw4ua-0003so-Gv for submit@debbugs.gnu.org; Sun, 03 Jan 2021 10:03:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59154) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kw4uY-0003sa-GM for 45409@debbugs.gnu.org; Sun, 03 Jan 2021 10:03:15 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:43359) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kw4uT-0007wa-Al; Sun, 03 Jan 2021 10:03:09 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=33260 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kw4uS-0000wW-Qk; Sun, 03 Jan 2021 10:03:09 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87y2hn9l8j.fsf@cbaines.net> <20201224172221.21057-1-mail@cbaines.net> Date: Sun, 03 Jan 2021 16:03:07 +0100 In-Reply-To: <20201224172221.21057-1-mail@cbaines.net> (Christopher Baines's message of "Thu, 24 Dec 2020 17:22:19 +0000") Message-ID: <87pn2m12s4.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: , Cc: 45409@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.83 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 3933C9404E4 X-Spam-Score: -2.83 X-Migadu-Scanner: scn1.migadu.com X-TUID: jOA1280yKhaz Hi! Christopher Baines skribis: > This separation between the code for dealing with narinfos from the code = doing > that for a purpose should make things clearer, and better support compone= nts > other that the substitute script in using this code. > > This is just moving the code around, no code should have been significant= ly > changed. > > * guix/scripts/substitute.scm (): Move record type to (guix nari= nfo). > (fields->alist, narinfo-hash-algorithm+value, narinfo-hash->sha256, > narinfo-signature->canonical-sexp, narinfo-maker, read-narinfo, > narinfo-sha256, valid-narinfo?, write-narinfo, narinfo->string, > string->narinfo, equivalent-narinfo?, supported-compression?, > compresses-better?, narinfo-best-uri): Move procedures to (guix narinfo). > (%compression-methods): Move variable to (guix narinfo). > * guix/narinfo.scm: New file. > * Makefile.am (MODULES): Add it. That=E2=80=99s a good idea! Please add guix/narinfo.scm to po/guix/POTFILES.in so it can be translated. > +(define-module (guix narinfo) > + #:use-module (guix ui) We should try and avoid (guix ui); is (guix diagnostics) enough? > + #:use-module (guix scripts substitute) (guix =E2=80=A6) modules must not depend on (guix scripts =E2=80=A6). Perhaps that=E2=80=99s just for =E2=80=98%allow-unauthenticated-substitutes= ?=E2=80=99, no? If so, let=E2=80=99s just not refer to =E2=80=98%allow-unauthenticated-substit= utes?=E2=80=99 here. It=E2=80=99s a hack to allow for tests, so better keep it local to (guix sc= ripts substitute). > +(define* (valid-narinfo? narinfo #:optional (acl (current-acl)) > + #:key verbose?) > + "Return #t if NARINFO's signature is not valid." > + (or (%allow-unauthenticated-substitutes?) Yeah, let=E2=80=99s remove it from here. At worst, we can always use =E2= =80=98mock=E2=80=99 in tests to make =E2=80=98valid-narinfo?=E2=80=99 return #t unconditionally. OK with these changes. After the change, please make sure =E2=80=9Cmake check=E2=80=9D and =E2=80= =9Cmake as-derivation=E2=80=9D still pass. For =E2=80=9Cmake as-derivation=E2=80=9D, we should also make = sure =E2=80=98guix-core=E2=80=99 doesn=E2=80=99t pull in everything via (guix sc= ripts substitute). (The zstd patches will conflict with this series but I=E2=80=99ll take care= of it once it=E2=80=99s applied.) Thanks, Ludo=E2=80=99.