civodul pushed a commit to branch master
in repository guix.
commit ec73570be5112a4e4f224b86e06529d1987f2088
Author: Ludovic Courtès <[email protected]>
AuthorDate: Mon Oct 17 22:57:39 2022 +0200
lint: 'probe-uri' honors the 'userinfo' part of URIs.
* guix/lint.scm (probe-uri): Honor the 'userinfo' part of URI.
---
guix/lint.scm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/guix/lint.scm b/guix/lint.scm
index 7ee3a3122f..1cbbba75c5 100644
--- a/guix/lint.scm
+++ b/guix/lint.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Cyril Roelandt <[email protected]>
;;; Copyright © 2014, 2015 Eric Bavier <[email protected]>
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic
Courtès <[email protected]>
+;;; Copyright © 2013-2022 Ludovic Courtès <[email protected]>
;;; Copyright © 2015, 2016 Mathieu Lirzin <[email protected]>
;;; Copyright © 2016 Danny Milosavljevic <[email protected]>
;;; Copyright © 2016 Hartmut Goebel <[email protected]>
@@ -34,6 +34,7 @@
#:use-module (guix store)
#:autoload (guix base16) (bytevector->base16-string)
#:use-module (guix base32)
+ #:autoload (guix base64) (base64-encode)
#:use-module (guix build-system)
#:use-module (guix diagnostics)
#:use-module (guix download)
@@ -63,6 +64,7 @@
#:use-module (ice-9 match)
#:use-module (ice-9 regex)
#:use-module (ice-9 format)
+ #:autoload (rnrs bytevectors) (string->utf8)
#:use-module (web client)
#:use-module (web uri)
#:use-module ((guix build download)
@@ -721,8 +723,14 @@ response from URI, and additional details, such as the
actual HTTP response.
TIMEOUT is the maximum number of seconds (possibly an inexact number) to wait
for connections to complete; when TIMEOUT is #f, wait as long as needed."
(define headers
- '((User-Agent . "GNU Guile")
- (Accept . "*/*")))
+ `((User-Agent . "GNU Guile")
+ (Accept . "*/*")
+ ,@(match (uri-userinfo uri)
+ ((? string? str) ;"basic authentication"
+ `((Authorization . ,(string-append "Basic "
+ (base64-encode
+ (string->utf8 str))))))
+ (_ '()))))
(let loop ((uri uri)
(visited '()))