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

auth-source.el (auth-source-debug): Enable by default and don't mention the obsolete `auth-source-hide-passwords'.

Browse source 
(auth-source-do-warn): New function to debug unconditionally.
 (auth-source-do-debug): Use it.
 (auth-source-backend-parse): Use it for invalid `auth-sources' entries and for Secrets API entries when the secrets.el library is not available.
This commit is contained in:
Teodor Zlatanov 2011-02-16 00:00:21 +00:00 • committed by Katsumi Yamaoka
parent 5415d0766d
commit ca6ddb88b5
2 changed files with 44 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/gnus/ChangeLog
View file

@ -1,3 +1,13 @@
2011-02-15 Teodor Zlatanov <tzz@lifelogs.com>
* auth-source.el (auth-source-debug): Enable by default and don't
mention the obsolete `auth-source-hide-passwords'.
(auth-source-do-warn): New function to debug unconditionally.
(auth-source-do-debug): Use it.
(auth-source-backend-parse): Use it for invalid `auth-sources' entries
and for Secrets API entries when the secrets.el library is not
available.
2011-02-14 Lars Ingebrigtsen <larsi@gnus.org> 2011-02-14 Lars Ingebrigtsen <larsi@gnus.org>
* gnus-sum.el (gnus-propagate-marks): Default to nil. * gnus-sum.el (gnus-propagate-marks): Default to nil.

44
lisp/gnus/auth-source.el
View file

@ -135,14 +135,15 @@
:version "23.2" ;; No Gnus :version "23.2" ;; No Gnus
:type `boolean) :type `boolean)
(defcustom auth-source-debug nil (defcustom auth-source-debug t
"Whether auth-source should log debug messages. "Whether auth-source should log debug messages.
Also see `auth-source-hide-passwords'.
If the value is nil, debug messages are not logged. If the value is nil, debug messages are not logged.
If the value is t, debug messages are logged with `message'.
In that case, your authentication data will be in the If the value is t, debug messages are logged with `message'. In
clear (except for passwords, which are always stripped out). that case, your authentication data will be in the clear (except
for passwords).
If the value is a function, debug messages are logged by calling If the value is a function, debug messages are logged by calling
that function using the same arguments as `message'." that function using the same arguments as `message'."
:group 'auth-source :group 'auth-source
@ -235,18 +236,22 @@ If the value is not a list, symmetric encryption will be used."
;; (auth-source-user-or-password-imap "password" "imap.myhost.com") ;; (auth-source-user-or-password-imap "password" "imap.myhost.com")
;; (auth-source-protocol-defaults 'imap) ;; (auth-source-protocol-defaults 'imap)
;; (let ((auth-source-debug 'debug)) (auth-source-debug "hello")) ;; (let ((auth-source-debug 'debug)) (auth-source-do-debug "hello"))
;; (let ((auth-source-debug t)) (auth-source-debug "hello")) ;; (let ((auth-source-debug t)) (auth-source-do-debug "hello"))
;; (let ((auth-source-debug nil)) (auth-source-debug "hello")) ;; (let ((auth-source-debug nil)) (auth-source-do-debug "hello"))
(defun auth-source-do-debug (&rest msg) (defun auth-source-do-debug (&rest msg)
;; set logger to either the function in auth-source-debug or 'message
;; note that it will be 'message if auth-source-debug is nil, so
;; we also check the value
(when auth-source-debug (when auth-source-debug
(let ((logger (if (functionp auth-source-debug) (apply 'auth-source-do-warn msg)))
(defun auth-source-do-warn (&rest msg)
(apply
;; set logger to either the function in auth-source-debug or 'message
;; note that it will be 'message if auth-source-debug is nil
(if (functionp auth-source-debug)
auth-source-debug auth-source-debug
'message))) 'message)
(apply logger msg)))) msg))
;; (auth-source-pick nil :host "any" :protocol 'imap :user "joe") ;; (auth-source-pick nil :host "any" :protocol 'imap :user "joe")
;; (auth-source-pick t :host "any" :protocol 'imap :user "joe") ;; (auth-source-pick t :host "any" :protocol 'imap :user "joe")
@ -312,16 +317,23 @@ If the value is not a list, symmetric encryption will be used."
(setq source (or (secrets-get-alias (symbol-name source)) (setq source (or (secrets-get-alias (symbol-name source))
"Login"))) "Login")))
(if (featurep 'secrets)
(auth-source-backend (auth-source-backend
(format "Secrets API (%s)" source) (format "Secrets API (%s)" source)
:source source :source source
:type 'secrets :type 'secrets
:search-function 'auth-source-secrets-search :search-function 'auth-source-secrets-search
:create-function 'auth-source-secrets-create))) :create-function 'auth-source-secrets-create)
(auth-source-do-warn
"auth-source-backend-parse: no Secrets API, ignoring spec: %S" entry)
(auth-source-backend
(format "Ignored Secrets API (%s)" source)
:source ""
:type 'ignore))))
;; none of them ;; none of them
(t (t
(auth-source-do-debug (auth-source-do-warn
"auth-source-backend-parse: invalid backend spec: %S" entry) "auth-source-backend-parse: invalid backend spec: %S" entry)
(auth-source-backend (auth-source-backend
"Empty" "Empty"