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 +qi8BQnh9F8PagAA0tVLHw (envelope-from ) for ; Tue, 05 Jan 2021 21:58:33 +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 iH79AAnh9F9BCgAAB5/wlQ (envelope-from ) for ; Tue, 05 Jan 2021 21:58:33 +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 A0DAE94036A for ; Tue, 5 Jan 2021 21:58:32 +0000 (UTC) Received: from localhost ([::1]:44298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwuLX-0003qp-J2 for larch@yhetil.org; Tue, 05 Jan 2021 16:58:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwuL4-0003cG-6p for guix-patches@gnu.org; Tue, 05 Jan 2021 16:58:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59548) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kwuL3-0005SQ-Vl for guix-patches@gnu.org; Tue, 05 Jan 2021 16:58:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kwuL3-0008Gs-UC for guix-patches@gnu.org; Tue, 05 Jan 2021 16:58:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45409] [PATCH v3 1/3] substitute: Untangle skipping authentication from valid-narinfo?. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Jan 2021 21:58:01 +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.160988383831722 (code B ref 45409); Tue, 05 Jan 2021 21:58:01 +0000 Received: (at 45409) by debbugs.gnu.org; 5 Jan 2021 21:57:18 +0000 Received: from localhost ([127.0.0.1]:42861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwuKM-0008Fa-A8 for submit@debbugs.gnu.org; Tue, 05 Jan 2021 16:57:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kwuKK-0008FB-0G for 45409@debbugs.gnu.org; Tue, 05 Jan 2021 16:57:16 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:45858) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwuKE-00059v-L8; Tue, 05 Jan 2021 16:57:10 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=41112 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kwuKC-0000lJ-0l; Tue, 05 Jan 2021 16:57:08 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87y2hn9l8j.fsf@cbaines.net> <20210104211927.14959-1-mail@cbaines.net> Date: Tue, 05 Jan 2021 22:57:06 +0100 In-Reply-To: <20210104211927.14959-1-mail@cbaines.net> (Christopher Baines's message of "Mon, 4 Jan 2021 21:19:25 +0000") Message-ID: <871rezt5cd.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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.84 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: A0DAE94036A X-Spam-Score: -2.84 X-Migadu-Scanner: scn0.migadu.com X-TUID: hPEJGDZiRPhB --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, Christopher Baines skribis: > Rather than having valid-narinfo? evaluate to #t if > %allow-unauthenticated-substitutes? is set to #t, just use (const #t) for > valid-narinfo? when %allow-unauthenticated-substitutes? is set to #t. Th= is > will allow moving valid-narinfo? in to a (guix substitutes) module. > > * guix/scripts/substitute.scm (process-query, process-substitution): Chan= ge > the authorized? argument to lookup-narinfo and lookup-narinfos/diverse ba= sed > on %allow-unauthenticated-substitutes?. > (valid-narinfo?): Remove use of %allow-unauthenticated-substitutes?. Bummer that there are two call sites. What about doing away with =E2=80=98%allow-unauthenticated-substitutes?=E2= =80=99 and instead changing its only user, =E2=80=98tests/substitute.scm=E2=80=99, lik= e so: --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/tests/substitute.scm b/tests/substitute.scm index 542aaf603f..1827ffe8d4 100644 --- a/tests/substitute.scm +++ b/tests/substitute.scm @@ -178,10 +178,10 @@ a file for NARINFO." (call-with-output-file (string-append narinfo-directory "/example.nar") (cute write-file - (string-append narinfo-directory "/example.out") <>)) - - (%allow-unauthenticated-substitutes? #f)) - thunk + (string-append narinfo-directory "/example.out") <>))) + (lambda () + (mock ((guix narinfo) valid-narinfo?) (const #t) + (thunk))) (lambda () (when (file-exists? cache-directory) (delete-file-recursively cache-directory)))))) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable That change would have to be made in the patch that creates (guix narinfo). WDYT? Ludo=E2=80=99. --=-=-=--