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

Decrypt SSH key password on demand and not unconditionally 

This still always decrypts the password, because `ssh-add` does not check
whether the key is already present in the current agent.  This should propably
done separately before calling `ssh-add`.
This commit is contained in:
Daniel - 2023-07-09 19:12:38 +02:00
parent 603315e5b1
commit 6fb76d1efd
Signed by: dbo
GPG Key ID: 784AA8DF0CCDF625
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -841,14 +841,39 @@ This is `db-light' and `solarized-light'."
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." for KEY-FILE."
;; XXX: check whether the key is already loaded in the current agent.
(with-environment-variables (("SSH_ASKPASS_REQUIRE" "never")) (with-environment-variables (("SSH_ASKPASS_REQUIRE" "never"))
(with-temp-buffer (let* ((key-file (expand-file-name key-file))
(unless (zerop (call-process-region (funcall password-fn) ; XXX: only compute password when it's needed? (proc (make-process :name "ssh-add"
nil :buffer nil
"ssh-add" ; XXX: generalize to also allow pageant? :command (list "ssh-add" key-file)
nil t nil :filter #'(lambda (process output)
(expand-file-name key-file))) (cond
(error "Adding SSH key %s failed: %s" key-file (buffer-string)))))) ((string= (format "Enter passphrase for %s: "
key-file)
output)
(process-send-string process (funcall password-fn))
(process-send-string process "\n"))
((or (save-match-data
(string-match (format "^Identity added: %s" key-file)
output))
(string= output "\n"))
;; Ignore harmless output
t)
(t (message "Unknown output received from ssh-agent: %s" output))))
:sentinel #'(lambda (_ event)
(cond
((string= event "finished\n")
(message "Successfully added %s to local SSH agent"
key-file))
(t (message "Adding SSH key %s failed, ssh-add process reached state %s"
key-file
event)))))))
;; 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
;; a process to finish?
(while (process-live-p proc)
(sit-for 0.2)))))
(defcustom db/known-ssh-keys nil (defcustom db/known-ssh-keys nil
"A alist mapping SSH key-files to their password entries. "A alist mapping SSH key-files to their password entries.