exot/.emacs.d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: exot:bbb75c7b46221b56f5fe7a3dc27eae23c36af5c3
Branches Tags
exot:master
..
compare: exot:53a9ede65c210bf6cb985cb99ea3757243e3247a
Branches Tags
exot:master

2 Commits
bbb75c7b46 ... 53a9ede65c

Author SHA1 Message Date
Daniel Borchmann
53a9ede65c
Marginally refactor function to add SSH keys to current agent 
Does this improve readability?
 2023-07-16 15:12:30 +02:00
Daniel Borchmann
1ec3dd24e6
Add some error-handling when adding SSH keyfiles 2023-07-16 15:12:26 +02:00
1 changed files with 27 additions and 20 deletions
Show Stats Expand all files Collapse all files

47
site-lisp/db-utils.el
View File

@ -840,7 +840,8 @@ This is `db-light' and `solarized-light'."
"Synchronously add key in KEY-FILE to currently running ssh-agent. "Synchronously add key in KEY-FILE to currently running ssh-agent.
PASSWORD-FN is supposed to be a function returning the password PASSWORD-FN is supposed to be a function returning the password
for KEY-FILE; PASSWORD-FN is called on demand. for KEY-FILE; PASSWORD-FN is called on demand. If KEY-FILE is
not readable, this function errors out.
This function uses ssh-add to add the key to the currently This function uses ssh-add to add the key to the currently
running ssh-agent and waits for the process to finish." running ssh-agent and waits for the process to finish."
@ -850,31 +851,37 @@ running ssh-agent and waits for the process to finish."
(user-error "SSH key %s does not exist, aborting" key-file)) (user-error "SSH key %s does not exist, aborting" key-file))
(with-environment-variables (("SSH_ASKPASS_REQUIRE" "never")) (with-environment-variables (("SSH_ASKPASS_REQUIRE" "never"))
(let ((proc (make-process :name "ssh-add"
:buffer nil (let* ((ssh-add-handle-output #'(lambda (process output)
:command (list "ssh-add" key-file) (cond
:filter #'(lambda (process output) ((string= (format "Enter passphrase for %s: "
(cond key-file)
((string= (format "Enter passphrase for %s: " output)
key-file) (process-send-string process (funcall password-fn))
output) (process-send-string process "\n"))
(process-send-string process (funcall password-fn)) ((or (save-match-data
(process-send-string process "\n")) (string-match (format "^Identity added: %s" key-file)
((or (save-match-data output))
(string-match (format "^Identity added: %s" key-file) (string= output "\n"))
output)) ;; Ignore harmless output
(string= output "\n")) t)
;; Ignore harmless output (t (message "Unknown output received from ssh-agent: %s" output)))))
t)
(t (message "Unknown output received from ssh-agent: %s" output)))) (ssh-add-handle-event-change #'(lambda (_ event)
:sentinel #'(lambda (_ event)
(cond (cond
((string= event "finished\n") ((string= event "finished\n")
(message "Successfully added %s to local SSH agent" (message "Successfully added %s to local SSH agent"
key-file)) key-file))
(t (message "Adding SSH key %s failed, ssh-add process reached state %s" (t (message "Adding SSH key %s failed, ssh-add process reached state %s"
key-file key-file
event))))))) event)))))
(proc (make-process :name "ssh-add"
:buffer nil
:command (list "ssh-add" key-file)
:filter ssh-add-handle-output
:sentinel ssh-add-handle-event-change)))
;; We are waiting for the process to finish, to not let its output ;; We are waiting for the process to finish, to not let its output
;; intermingle with others. XXX: is there a more standard way to wait for ;; intermingle with others. XXX: is there a more standard way to wait for
;; a process to finish? ;; a process to finish?