From fc1cf31f77e957458f68b23e1a521b00208041bd Mon Sep 17 00:00:00 2001
From: vxtls <187420201+vxtls@users.noreply.github.com>
Date: Thu, 12 Mar 2026 10:47:43 -0400
Subject: [PATCH] fix(guix-bootstrap): allow offline distfiles in
 perform-download

---
 steps-guix/guix-1.5.0/pass1.sh                |  4 ++
 ...-local-distfiles-in-perform-download.patch | 51 +++++++++++++++++++
 steps-guix/improve/guix-daemon-and-pull.sh    |  2 +
 3 files changed, 57 insertions(+)
 create mode 100644 steps-guix/guix-1.5.0/patches/allow-local-distfiles-in-perform-download.patch

diff --git a/steps-guix/guix-1.5.0/pass1.sh b/steps-guix/guix-1.5.0/pass1.sh
index 1fb19cfc..b196e456 100755
--- a/steps-guix/guix-1.5.0/pass1.sh
+++ b/steps-guix/guix-1.5.0/pass1.sh
@@ -33,6 +33,8 @@ src_prepare() {
         false
     fi
 
+    patch --dry-run -p1 < "${base_dir}/patches/allow-local-distfiles-in-perform-download.patch"
+    patch -p1 < "${base_dir}/patches/allow-local-distfiles-in-perform-download.patch"
     sed \
         -e "s|@EXEC_BASH_HASH@|${EXEC_BASH_HASH}|g" \
         -e "s|@EXEC_MKDIR_HASH@|${EXEC_MKDIR_HASH}|g" \
@@ -69,6 +71,8 @@ src_prepare() {
     grep -q "${MESCC_TOOLS_SEED_HASH}" "${bootstrap_scm}"
     grep -q "All bootstrap binaries must come from local, reproducible distfiles." "${bootstrap_scm}"
     grep -q "%bootstrap-linux-headers-base-urls" "${bootstrap_scm}"
+    grep -q "%allowed-local-download-directories" guix/scripts/perform-download.scm
+    grep -q '"/external/distfiles"' guix/scripts/perform-download.scm
     grep -q '^(define (bootstrap-mes-minimal-origin system)' "${bootstrap_scm}"
     grep -q '^(define %bootstrap-mescc-tools' "${bootstrap_scm}"
     grep -q "mes-minimal-stripped-0.19-i686-linux.tar.xz" "${bootstrap_scm}"
diff --git a/steps-guix/guix-1.5.0/patches/allow-local-distfiles-in-perform-download.patch b/steps-guix/guix-1.5.0/patches/allow-local-distfiles-in-perform-download.patch
new file mode 100644
index 00000000..56e57e52
--- /dev/null
+++ b/steps-guix/guix-1.5.0/patches/allow-local-distfiles-in-perform-download.patch
@@ -0,0 +1,51 @@
+--- a/guix/scripts/perform-download.scm
++++ b/guix/scripts/perform-download.scm
+@@ -97,16 +97,46 @@ a list of wrapper procedures for safely calling the list of procedures that
+   (call-with-port (open file (logior O_NOFOLLOW O_RDONLY))
+     proc))
+ 
++(define %allowed-local-download-directories
++  ;; Allow only the explicitly prepared offline distfiles directory.  Other
++  ;; local file URLs remain forbidden.
++  '("/external/distfiles"))
++
++(define (path-within-directory? path directory)
++  (or (string=? path directory)
++      (string-prefix? (string-append directory "/") path)))
++
++(define (allowed-local-file? path)
++  (let ((canon-path (false-if-exception (canonicalize-path path))))
++    (and canon-path
++         (let loop ((directories %allowed-local-download-directories))
++           (match directories
++             (() #f)
++             ((directory rest ...)
++              (let ((canon-directory
++                     (false-if-exception (canonicalize-path directory))))
++                (if (and canon-directory
++                         (path-within-directory? canon-path canon-directory))
++                    #t
++                    (loop rest)))))))))
++
++(define (file-uri-allowed? url)
++  (let ((uri (string->uri url)))
++    (and uri
++         (eq? (uri-scheme uri) 'file)
++         (allowed-local-file? (uri-path uri)))))
++
+ (define (assert-non-local-urls url)
+   "Exit if URL (or any element of URL if it is a list) is either not a valid
+ URL or is a URL for a local file."
+   (for-each (lambda (url)
+-              (let ((scheme (and=> (string->uri url) uri-scheme)))
+-                (unless scheme
++              (let ((uri (string->uri url)))
++                (unless uri
+                   (leave (G_ "URL ~S can't be decoded~%") url))
+-                (when (eq? scheme 'file)
++                (when (and (eq? (uri-scheme uri) 'file)
++                           (not (file-uri-allowed? url)))
+                   (leave (G_ "URL ~S is for a local file~%") url))))
+             (if (list? url)
+                 url
+                 (list url))))
diff --git a/steps-guix/improve/guix-daemon-and-pull.sh b/steps-guix/improve/guix-daemon-and-pull.sh
index 52bd1406..fc717b05 100644
--- a/steps-guix/improve/guix-daemon-and-pull.sh
+++ b/steps-guix/improve/guix-daemon-and-pull.sh
@@ -107,6 +107,8 @@ prepare_local_channel_checkout() {
 
     (
         cd "${channel_repo}"
+        patch --dry-run -p1 < "${guix_patch_dir}/allow-local-distfiles-in-perform-download.patch"
+        patch -p1 < "${guix_patch_dir}/allow-local-distfiles-in-perform-download.patch"
         patch --dry-run -p1 < "${guix_patch_dir}/enforce-local-bootstrap-binaries-except-linux-headers.patch"
         patch -p1 < "${guix_patch_dir}/enforce-local-bootstrap-binaries-except-linux-headers.patch"
         patch --dry-run -p1 < "${rendered_patch}"