From: zimoun <zimon.toutoune@gmail.com>
To: 42019@debbugs.gnu.org
Cc: zimoun <zimon.toutoune@gmail.com>
Subject: [bug#42019] [PATCH v2] website: Add integrity to JSON sources.
Date: Mon, 29 Jun 2020 18:50:57 +0200 [thread overview]
Message-ID: <20200629165057.9451-1-zimon.toutoune@gmail.com> (raw)
In-Reply-To: <20200623151323.29639-1-zimon.toutoune@gmail.com>
* website/apps/packages/builder.scm (origin->json): Add integrity field using
SRI format.
---
website/apps/packages/builder.scm | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/website/apps/packages/builder.scm b/website/apps/packages/builder.scm
index d2bccd7..fa488a5 100644
--- a/website/apps/packages/builder.scm
+++ b/website/apps/packages/builder.scm
@@ -46,6 +46,9 @@
#:use-module (guix hg-download)
#:use-module (guix utils) ;location
#:use-module ((guix build download) #:select (maybe-expand-mirrors))
+ #:use-module ((guix base64) #:select (base64-encode))
+ #:use-module ((guix describe) #:select (current-profile))
+ #:use-module ((guix config) #:select (%guix-version))
#:use-module (json)
#:use-module (ice-9 match)
#:use-module ((web uri) #:select (string->uri uri->string))
@@ -114,7 +117,7 @@
,@(cond ((or (eq? url-fetch method)
(eq? url-fetch/tarbomb method)
(eq? url-fetch/zipbomb method))
- `(("url" . ,(list->vector
+ `(("urls" . ,(list->vector
(resolve
(match uri
((? string? url) (list url))
@@ -128,6 +131,16 @@
((eq? hg-fetch method)
`(("hg_url" . ,(hg-reference-url uri))))
(else '()))
+ ,@(if (or (eq? url-fetch method)
+ (eq? url-fetch/tarbomb method)
+ (eq? url-fetch/zipbomb method))
+ (let* ((content-hash (origin-hash origin))
+ (hash-value (content-hash-value content-hash))
+ (hash-algorithm (content-hash-algorithm content-hash))
+ (algorithm-string (symbol->string hash-algorithm)))
+ `(("integrity" . ,(string-append algorithm-string "-"
+ (base64-encode hash-value)))))
+ '())
,@(if (eq? method git-fetch)
`(("git_ref" . ,(git-reference-commit uri)))
'())
@@ -174,9 +187,11 @@
scm->json))
(define (sources-json-builder)
- "Return a JSON page listing all the sources.
-
-See <https://forge.softwareheritage.org/D2025#51269>."
+ "Return a JSON page listing all the sources."
+ ;; The Software Heritage format is described here:
+ ;; https://forge.softwareheritage.org/source/swh-loader-core/browse/master/swh/loader/package/nixguix/tests/data/https_nix-community.github.io/nixpkgs-swh_sources.json
+ ;; And the loader is implemented here:
+ ;; https://forge.softwareheritage.org/source/swh-loader-core/browse/master/swh/loader/package/nixguix/
(define (package->json package)
`(,@(if (origin? (package-source package))
(origin->json (package-source package))
@@ -185,7 +200,13 @@ See <https://forge.softwareheritage.org/D2025#51269>."
(make-page "sources.json"
`(("sources" . ,(list->vector (map package->json (all-packages))))
- ("version" . "1"))
+ ("version" . "1")
+ ("revision" .
+ ,(match (current-profile)
+ (#f %guix-version) ;for lack of a better ID
+ (profile
+ (let ((channel (find guix-channel? (profile-channels profile))))
+ (channel-commit channel))))))
scm->json))
(define (index-builder)
--
2.26.2
next prev parent reply other threads:[~2020-06-29 16:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 15:13 [bug#42019] [PATCH 0/1] sources.json compliant with SWH loader zimoun
2020-06-23 15:21 ` [bug#42019] [PATCH 1/1] website: Add integrity to JSON sources zimoun
2020-06-27 17:05 ` Ludovic Courtès
2020-06-27 17:41 ` zimoun
2020-06-29 17:01 ` zimoun
2020-06-29 20:41 ` Ludovic Courtès
2020-06-29 23:28 ` zimoun
2020-07-01 19:35 ` Christopher Baines
2020-07-01 20:29 ` zimoun
2020-06-29 16:50 ` zimoun [this message]
2020-07-06 10:20 ` bug#42019: [PATCH v2] " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200629165057.9451-1-zimon.toutoune@gmail.com \
--to=zimon.toutoune@gmail.com \
--cc=42019@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.