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

Delay computation of SSH-Key password until start of ssh-add

Browse Source 
This is to prepare computing the password only when needed, i.e., when the key
is not already included in the running agent.  We are not there yet, though.
This commit is contained in:
Daniel Borchmann 2023-07-09 17:55:19 +02:00
parent bf88128d25
commit 603315e5b1
No known key found for this signature in database
GPG Key ID: 784AA8DF0CCDF625
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -836,11 +836,15 @@ This is `db-light' and `solarized-light'."
;;; SSH-Key-Handling
(defun db/add-ssh-key-with-password (key-file password)
"Add key in KEY-FILE with PASSWORD to currently running ssh-agent."
(defun db/add-ssh-key-with-password (key-file password-fn)
"Add key in KEY-FILE to currently running ssh-agent.
PASSWORD-FN is supposed to be a function returning the password
for KEY-FILE."
(with-environment-variables (("SSH_ASKPASS_REQUIRE" "never"))
(with-temp-buffer
(unless (zerop (call-process-region password nil ; XXX: only compute password when it's needed?
(unless (zerop (call-process-region (funcall password-fn) ; XXX: only compute password when it's needed?
nil
"ssh-add" ; XXX: generalize to also allow pageant?
nil t nil
(expand-file-name key-file)))
@ -868,7 +872,9 @@ holding the password to unlock the key."
;; XXX: error handling
(interactive)
(pcase-dolist (`(,ssh-key . ,pass-entry) db/known-ssh-keys)
(db/add-ssh-key-with-password ssh-key (apply #'db/password-from-storage pass-entry))))
(db/add-ssh-key-with-password ssh-key
#'(lambda ()
(apply #'db/password-from-storage pass-entry)))))
(cl-defgeneric db/password-from-storage (type entry-key)
"Retrieve password from storage of type TYPE with lookup key ENTRY-KEY.")