me/guix
Archived
1
0
Fork 0
Code Activity

substitute: Handle "invalid session" GnuTLS errors on reused connections.

Browse source 
Reported by Christopher Baines <mail@cbaines.net>
at <https://issues.guix.gnu.org/45323#2>.

* guix/scripts/substitute.scm (call-with-cached-connection): Handle
'gnutls-error and ERROR/INVALID-SESSION.
This commit is contained in:
Ludovic Courtès 2021-01-04 11:05:58 +01:00
parent ed63b7f87e
commit 9158020d78
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
guix/scripts/substitute.scm
View file

@ -43,6 +43,7 @@
(open-connection-for-uri (open-connection-for-uri
. guix:open-connection-for-uri) . guix:open-connection-for-uri)
store-path-abbreviation byte-count->string)) store-path-abbreviation byte-count->string))
#:autoload (gnutls) (error/invalid-session)
#:use-module (guix progress) #:use-module (guix progress)
#:use-module ((guix build syscalls) #:use-module ((guix build syscalls)
#:select (set-thread-name)) #:select (set-thread-name))
@ -1054,9 +1055,12 @@ server certificates."
;; If PORT was cached and the server closed the connection in the ;; If PORT was cached and the server closed the connection in the
;; meantime, we get EPIPE. In that case, open a fresh connection and ;; meantime, we get EPIPE. In that case, open a fresh connection and
;; retry. We might also get 'bad-response or a similar exception from ;; retry. We might also get 'bad-response or a similar exception from
;; (web response) later on, once we've sent the request. ;; (web response) later on, once we've sent the request, or a
;; ERROR/INVALID-SESSION from GnuTLS.
(if (or (and (eq? key 'system-error) (if (or (and (eq? key 'system-error)
(= EPIPE (system-error-errno `(,key ,@args)))) (= EPIPE (system-error-errno `(,key ,@args))))
(and (eq? key 'gnutls-error)
(eq? (first args) error/invalid-session))
(memq key '(bad-response bad-header bad-header-component))) (memq key '(bad-response bad-header bad-header-component)))
(proc (open-connection uri #:fresh? #t)) (proc (open-connection uri #:fresh? #t))
(apply throw key args)))))) (apply throw key args))))))