mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Do not save empty passwords in auth-source-search

Browse source 
* lisp/auth-source.el (auth-source-netrc-create)
(auth-source-secrets-create): Set :save-function only for non
empty passwords.

* lisp/net/tramp.el (tramp-read-passwd): Don't save empty passwords.

* test/lisp/auth-source-tests.el
(auth-source-test-secrets-create-secret): Adapt test.
(auth-source-test-netrc-create-secret): New test.
This commit is contained in:
Michael Albinus 2021-09-19 19:59:05 +02:00
parent 7abbf3779c
commit 788a65862e
3 changed files with 131 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

50
lisp/auth-source.el
View file

@ -1282,6 +1282,8 @@ See `auth-source-search' for details on SPEC."
(required (append base-required create-extra))
(file (oref backend source))
(add "")
;; Whether to set save-function.
save-function
;; `valist' is an alist
valist
;; `artificial' will be returned if no creation is needed
@ -1411,6 +1413,8 @@ See `auth-source-search' for details on SPEC."
;; When r is not an empty string...
(when (and (stringp data)
(< 0 (length data)))
(when (eq r 'secret)
(setq save-function t))
;; this function is not strictly necessary but I think it
;; makes the code clearer -tzz
(let ((printer (lambda ()
@ -1431,12 +1435,13 @@ See `auth-source-search' for details on SPEC."
data)))))
(setq add (concat add (funcall printer)))))))
(plist-put
artificial
:save-function
(let ((file file)
(add add))
(lambda () (auth-source-netrc-saver file add))))
(when save-function
(plist-put
artificial
:save-function
(let ((file file)
(add add))
(lambda () (auth-source-netrc-saver file add)))))
(list artificial)))
@ -1664,6 +1669,8 @@ authentication tokens:
:port port)))
(required (append base-required create-extra))
(collection (oref backend source))
;; Whether to set save-function.
save-function
;; `args' are the arguments for `secrets-create-item'.
args
;; `valist' is an alist
@ -1778,21 +1785,24 @@ authentication tokens:
;; When r is not an empty string...
(when (and (stringp data)
(< 0 (length data))
(not (member r '(secret label))))
;; append the key (the symbol name of r)
;; and the value in r
(setq args (append args (list (auth-source--symbol-keyword r) data))))))
(< 0 (length data)))
(if (eq r 'secret)
(setq save-function t)
(if (not (eq r 'label))
;; append the key (the symbol name of r)
;; and the value in r
(setq args (append args (list (auth-source--symbol-keyword r) data))))))))
(plist-put
artificial
:save-function
(let* ((collection collection)
(item (plist-get artificial :label))
(secret (plist-get artificial :secret))
(secret (if (functionp secret) (funcall secret) secret)))
(lambda ()
(auth-source-secrets-saver collection item secret args))))
(when save-function
(plist-put
artificial
:save-function
(let* ((collection collection)
(item (plist-get artificial :label))
(secret (plist-get artificial :secret))
(secret (if (functionp secret) (funcall secret) secret)))
(lambda ()
(auth-source-secrets-saver collection item secret args)))))
(list artificial)))