guix/guix
3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Code Issues Releases Wiki Activity

secret-service: Add a timeout when waiting for a client.

Browse source 
* gnu/build/secret-service.scm (secret-service-receive-secrets)
[wait-for-client]: Call 'select' with a 60s timeout before 'accept'.
Return #f upon timeout.
[read-secrets]: Return FILES on success.
Adjust caller of 'wait-for-client' to handle #f.
This commit is contained in:
Ludovic Courtès 2020-09-27 17:21:16 +02:00
parent 1edb7c7eec
commit 4d047853da
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
gnu/build/secret-service.scm
View file

@ -75,7 +75,8 @@ local PORT. If connect fails, sleep 1s and retry RETRY times."
(define (secret-service-receive-secrets port)
"Listen to local PORT and wait for a secret service client to send secrets.
Write them to the file system."
Write them to the file system. Return the list of files installed on success,
and #f otherwise."
(define (wait-for-client port)
;; Wait for a TCP connection on PORT. Note: We cannot use the
@ -87,14 +88,20 @@ Write them to the file system."
(format (current-error-port)
"secret service: waiting for secrets on port ~a...~%"
port)
(match (accept sock)
((client . address)
(match (select (list sock) '() '() 60)
(((_) () ())
(match (accept sock)
((client . address)
(format (current-error-port)
"secret service: client connection from ~a~%"
(inet-ntop (sockaddr:fam address)
(sockaddr:addr address)))
(close-port sock)
client)))
((() () ())
(format (current-error-port)
"secret service: client connection from ~a~%"
(inet-ntop (sockaddr:fam address)
(sockaddr:addr address)))
(close-port sock)
client))))
"secret service: did not receive any secrets; time out~%")
#f))))
;; TODO: Remove when (@ (guix build utils) dump-port) has a 'size'
;; parameter.
@ -128,15 +135,17 @@ installing file '~a' (~a bytes)...~%"
(lambda (output)
(dump port output size)
(chmod file mode))))
files sizes modes))
files sizes modes)
files)
(_
(format (current-error-port)
"secret service: invalid secrets received~%")
#f)))
(let* ((port (wait-for-client port))
(result (read-secrets port)))
(close-port port)
(let* ((port (wait-for-client port))
(result (and=> port read-secrets)))
(when port
(close-port port))
result))
;;; secret-service.scm ends here