me
/
guix
Archived
1
0
Fork 0
Code

ssh: Add Kerberos-support to ssh:// daemon URLs 

* guix/ssh.scm (open-ssh-session): Fall back to GSSAPI if public key
authentication does not work

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Lars-Dominik Braun 2020-02-19 11:13:54 +01:00 committed by Ludovic Courtès
parent ef30ddb2c2
commit 35f3511167
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/guix.texi
View File

@ -6811,8 +6811,9 @@ instruct it to listen for TCP connections (@pxref{Invoking guix-daemon,
@item ssh @item ssh
@cindex SSH access to build daemons @cindex SSH access to build daemons
These URIs allow you to connect to a remote daemon over These URIs allow you to connect to a remote daemon over
SSH@footnote{This feature requires Guile-SSH (@pxref{Requirements}).}. SSH. This feature requires Guile-SSH (@pxref{Requirements}) and a working
A typical URL might look like this: @code{guile} binary in @code{PATH} on the destination machine. It supports
public key and GSSAPI authentication. A typical URL might look like this:
@example @example
ssh://charlie@@guix.example.org:22 ssh://charlie@@guix.example.org:22

15
guix/ssh.scm
View File

@ -157,11 +157,16 @@ server at '~a': ~a")
(session-set! session 'timeout timeout) (session-set! session 'timeout timeout)
session) session)
(x (x
(disconnect! session) (match (userauth-gssapi! session)
(raise (condition ('success
(&message (session-set! session 'timeout timeout)
(message (format #f (G_ "SSH authentication failed for '~a': ~a~%") session)
host (get-error session))))))))) (x
(disconnect! session)
(raise (condition
(&message
(message (format #f (G_ "SSH authentication failed for '~a': ~a~%")
host (get-error session)))))))))))
(x (x
;; Connection failed or timeout expired. ;; Connection failed or timeout expired.
(raise (condition (raise (condition