mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
download: Use basic authentication when userinfo is present in URI.
* guix/download.scm (url-fetch): Include (guix base64) module on the build-side. * guix/build/download.scm (http-fetch): Add "Authorization" header when userinfo is present in the URI.
This commit is contained in:
parent
8dec2229a2
commit
242ad41c01
2 changed files with 14 additions and 3 deletions
|
@ -23,9 +23,11 @@ (define-module (guix build download)
|
|||
#:use-module (web http)
|
||||
#:use-module ((web client) #:hide (open-socket-for-uri))
|
||||
#:use-module (web response)
|
||||
#:use-module (guix base64)
|
||||
#:use-module (guix ftp-client)
|
||||
#:use-module (guix build utils)
|
||||
#:use-module (rnrs io ports)
|
||||
#:use-module (rnrs bytevectors)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-11)
|
||||
#:use-module (srfi srfi-19)
|
||||
|
@ -598,14 +600,22 @@ (define post-2.0.7?
|
|||
(string>? (version) "2.0.7")))
|
||||
|
||||
(define headers
|
||||
'(;; Some web sites, such as http://dist.schmorp.de, would block you if
|
||||
`(;; Some web sites, such as http://dist.schmorp.de, would block you if
|
||||
;; there's no 'User-Agent' header, presumably on the assumption that
|
||||
;; you're a spammer. So work around that.
|
||||
(User-Agent . "GNU Guile")
|
||||
|
||||
;; Some servers, such as https://alioth.debian.org, return "406 Not
|
||||
;; Acceptable" when not explicitly told that everything is accepted.
|
||||
(Accept . "*/*")))
|
||||
(Accept . "*/*")
|
||||
|
||||
;; Basic authentication, if needed.
|
||||
,@(match (uri-userinfo uri)
|
||||
((? string? str)
|
||||
`((Authorization . ,(string-append "Basic "
|
||||
(base64-encode
|
||||
(string->utf8 str))))))
|
||||
(_ '()))))
|
||||
|
||||
(let*-values (((connection)
|
||||
(open-connection-for-uri uri #:timeout timeout))
|
||||
|
|
|
@ -328,7 +328,8 @@ (define builder
|
|||
#:modules '((guix build download)
|
||||
(guix build utils)
|
||||
(guix ftp-client)
|
||||
(guix base32))
|
||||
(guix base32)
|
||||
(guix base64))
|
||||
|
||||
;; Use environment variables and a fixed script
|
||||
;; name so there's only one script in store for
|
||||
|
|
Loading…
Reference in a new issue