[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/12: git-authenticate: Load the list of authorized keys from the tree.
From: |
guix-commits |
Subject: |
11/12: git-authenticate: Load the list of authorized keys from the tree. |
Date: |
Fri, 1 May 2020 12:46:19 -0400 (EDT) |
civodul pushed a commit to branch wip-openpgp
in repository guix.
commit 6960064ddc97d460fddcfc212ab91eaa58bd44d8
Author: Ludovic Courtès <address@hidden>
AuthorDate: Fri May 1 16:30:41 2020 +0200
git-authenticate: Load the list of authorized keys from the tree.
* build-aux/git-authenticate.scm (read-authorizations)
(commit-authorized-keys): New procedures.
(authenticate-commit): Use it instead of %AUTHORIZED-SIGNING-KEYS.
---
build-aux/git-authenticate.scm | 37 ++++++++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm
index 0d5eb4c..fc02f9e 100644
--- a/build-aux/git-authenticate.scm
+++ b/build-aux/git-authenticate.scm
@@ -34,6 +34,7 @@
(srfi srfi-26)
(srfi srfi-34)
(srfi srfi-35)
+ (rnrs bytevectors)
(rnrs io ports)
(ice-9 match)
(ice-9 format)
@@ -266,6 +267,39 @@ commit ~a: key ~a is missing")
data))))))
('good-signature data)))))))
+(define (read-authorizations port)
+ "Read authorizations in the '.guix-authorizations' format from PORT, and
+return a list of authorized fingerprints."
+ (match (read port)
+ (('authorizations ('version 0)
+ (((? string? fingerprints) _ ...) ...)
+ _ ...)
+ (map (lambda (fingerprint)
+ (base16-string->bytevector
+ (string-downcase (string-filter char-set:graphic fingerprint))))
+ fingerprints))))
+
+(define* (commit-authorized-keys repository commit
+ #:optional (default-authorizations '()))
+ "Return the list of OpenPGP fingerprints authorized to sign COMMIT, based on
+authorizations listed in its parent commits. If one of the parent commits
+does not specify anything, fall back to DEFAULT-AUTHORIZATIONS."
+ (define (commit-authorizations commit)
+ (catch 'git-error
+ (lambda ()
+ (let* ((tree (commit-tree commit))
+ (entry (tree-entry-bypath tree ".guix-authorizations"))
+ (blob (blob-lookup repository (tree-entry-id entry))))
+ (read-authorizations
+ (open-bytevector-input-port (blob-content blob)))))
+ (lambda (key error)
+ (if (= (git-error-code error) GIT_ENOTFOUND)
+ default-authorizations
+ (throw key error)))))
+
+ (apply lset-intersection bytevector=?
+ (map commit-authorizations (commit-parents commit))))
+
(define (authenticate-commit repository commit keyring)
"Authenticate COMMIT from REPOSITORY and return the signing key fingerprint.
Raise an error when authentication fails."
@@ -276,7 +310,8 @@ Raise an error when authentication fails."
(commit-signing-key repository id keyring))
(unless (member (openpgp-public-key-fingerprint signing-key)
- %authorized-signing-keys)
+ (commit-authorized-keys repository commit
+ %authorized-signing-keys))
(raise (condition
(&message
(message (format #f (G_ "commit ~a not signed by an authorized \
- branch wip-openpgp created (now 8916c2f), guix-commits, 2020/05/01
- 01/12: Add '.guix-authorizations'., guix-commits, 2020/05/01
- 02/12: DRAFT Add (guix openpgp)., guix-commits, 2020/05/01
- 04/12: openpgp: Store the issuer key id and fingerprint in <openpgp-signature>., guix-commits, 2020/05/01
- 03/12: openpgp: Decode the issuer-fingerprint signature subpacket., guix-commits, 2020/05/01
- 05/12: openpgp: Add 'lookup-key-by-fingerprint'., guix-commits, 2020/05/01
- 07/12: openpgp: 'lookup-key-by-{id, fingerprint}' return the key first., guix-commits, 2020/05/01
- 09/12: git-authenticate: Use (guix openpgp)., guix-commits, 2020/05/01
- 06/12: openpgp: 'verify-openpgp-signature' looks up by fingerprint when possible., guix-commits, 2020/05/01
- 08/12: openpgp: Add 'string->openpgp-packet'., guix-commits, 2020/05/01
- 11/12: git-authenticate: Load the list of authorized keys from the tree.,
guix-commits <=
- 10/12: .guix-authorizations: Augment., guix-commits, 2020/05/01
- 12/12: git-authenticate: Load the keyring from the repository., guix-commits, 2020/05/01