From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id UF64NMuz3l5cRQAA0tVLHw (envelope-from ) for ; Mon, 08 Jun 2020 21:55:23 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id CJh1MMuz3l7TCgAAbx9fmQ (envelope-from ) for ; Mon, 08 Jun 2020 21:55:23 +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 9645A940145 for ; Mon, 8 Jun 2020 21:55:23 +0000 (UTC) Received: from localhost ([::1]:44900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jiPjm-0004gL-EE for larch@yhetil.org; Mon, 08 Jun 2020 17:55:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jiPjT-0004Xn-MD for bug-guix@gnu.org; Mon, 08 Jun 2020 17:55:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46564) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jiPjT-0008CD-C7 for bug-guix@gnu.org; Mon, 08 Jun 2020 17:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jiPjT-0006WV-BP; Mon, 08 Jun 2020 17:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#22883: [PATCH 1/9] git-authenticate: Cache takes a key parameter. References: <87io14sqoa.fsf@dustycloud.org> In-Reply-To: <87io14sqoa.fsf@dustycloud.org> Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 08 Jun 2020 21:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22883 X-GNU-PR-Package: guix X-GNU-PR-Keywords: security To: 22883@debbugs.gnu.org Received: via spool by 22883-submit@debbugs.gnu.org id=B22883.159165328824922 (code B ref 22883); Mon, 08 Jun 2020 21:55:03 +0000 Received: (at 22883) by debbugs.gnu.org; 8 Jun 2020 21:54:48 +0000 Received: from localhost ([127.0.0.1]:58081 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jiPjE-0006Tt-AT for submit@debbugs.gnu.org; Mon, 08 Jun 2020 17:54:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jiPjD-0006Td-6b for 22883@debbugs.gnu.org; Mon, 08 Jun 2020 17:54:47 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57654) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jiPj7-00082Q-Hn; Mon, 08 Jun 2020 17:54:41 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=56818 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jiPj6-0007OP-V8; Mon, 08 Jun 2020 17:54:41 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Mon, 8 Jun 2020 23:54:07 +0200 Message-Id: <20200608215415.2871-1-ludo@gnu.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: 3.99 X-TUID: dtDFmdqUT73p * guix/git-authenticate.scm (authenticated-commit-cache-file) (cache-authenticated-commit, previously-authenticated-commits): Add 'key' parameter and honor it. * build-aux/git-authenticate.scm (git-authenticate): Pass "channels/guix" as the key. --- build-aux/git-authenticate.scm | 5 +++-- guix/git-authenticate.scm | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index 5e1fdaaa24..a3d4b40ccf 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm @@ -252,7 +252,7 @@ (filter-map (lambda (id) (false-if-exception (commit-lookup repository (string->oid id)))) - (previously-authenticated-commits))) + (previously-authenticated-commits "channels/guix"))) (define commits ;; Commits to authenticate, excluding the closure of @@ -274,7 +274,8 @@ #:default-authorizations %historical-authorized-signing-keys #:report-progress report))))) - (cache-authenticated-commit (oid->string (commit-id end-commit))) + (cache-authenticated-commit "channels/guix" + (oid->string (commit-id end-commit))) (unless (null? stats) (format #t (G_ "Signing statistics:~%")) diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm index c333717136..6d71228d72 100644 --- a/guix/git-authenticate.scm +++ b/guix/git-authenticate.scm @@ -272,33 +272,33 @@ The OpenPGP keyring is loaded from KEYRING-REFERENCE in REPOSITORY." ;;; Caching. ;;; -(define (authenticated-commit-cache-file) +(define (authenticated-commit-cache-file key) "Return the name of the file that contains the cache of -previously-authenticated commits." - (string-append (cache-directory) "/authentication/channels/guix")) +previously-authenticated commits for KEY." + (string-append (cache-directory) "/authentication/" key)) -(define (previously-authenticated-commits) - "Return the previously-authenticated commits as a list of commit IDs (hex -strings)." +(define (previously-authenticated-commits key) + "Return the previously-authenticated commits under KEY as a list of commit +IDs (hex strings)." (catch 'system-error (lambda () - (call-with-input-file (authenticated-commit-cache-file) + (call-with-input-file (authenticated-commit-cache-file key) read)) (lambda args (if (= ENOENT (system-error-errno args)) '() (apply throw args))))) -(define (cache-authenticated-commit commit-id) - "Record in ~/.cache COMMIT-ID and its closure as authenticated (only -COMMIT-ID is written to cache, though)." +(define (cache-authenticated-commit key commit-id) + "Record in ~/.cache, under KEY, COMMIT-ID and its closure as +authenticated (only COMMIT-ID is written to cache, though)." (define %max-cache-length ;; Maximum number of commits in cache. 200) (let ((lst (delete-duplicates - (cons commit-id (previously-authenticated-commits)))) - (file (authenticated-commit-cache-file))) + (cons commit-id (previously-authenticated-commits key)))) + (file (authenticated-commit-cache-file key))) (mkdir-p (dirname file)) (with-atomic-file-output file (lambda (port) -- 2.26.2