Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make smtpmail try all auth methods

Browse source 
* lisp/mail/smtpmail.el (smtpmail-try-auth-methods): Try all valid
methods, even if one fails (bug#48562).
This commit is contained in:
Lars Ingebrigtsen 2022-07-13 14:34:30 +02:00
parent 9f6d8486b4
commit 3d7a832092
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lisp/mail/smtpmail.el
View file

@ -550,7 +550,6 @@ for `smtpmail-try-auth-method'.")
:require (and ask-for-password
'(:user :secret))
:create ask-for-password)))
(mech (or (plist-get auth-info :smtp-auth) (car mechs)))
(user (plist-get auth-info :user))
(password (auth-info-password auth-info))
(save-function (and ask-for-password
@ -570,18 +569,26 @@ for `smtpmail-try-auth-method'.")
:require '(:user :secret)
:create t))
password (auth-info-password auth-info)))
(let ((result (catch 'done
(if (and mech user password)
(smtpmail-try-auth-method process mech user password)
;; No mechanism, or no credentials.
mech))))
(if (stringp result)
(progn
(auth-source-forget+ :host host :port port)
(throw 'done result))
(when save-function
(funcall save-function))
result))))
(let ((mechs (or (ensure-list (plist-get auth-info :smtp-auth))
mechs))
(result ""))
(when (and mechs user password)
(while (and mechs
(stringp result))
(setq result (catch 'done
(smtpmail-try-auth-method
process (pop mechs) user password))))
;; A string result is an error.
(if (stringp result)
(progn
;; All methods failed.
;; Forget the credentials.
(auth-source-forget+ :host host :port port)
(throw 'done result))
;; Success.
(when save-function
(funcall save-function))
result)))))
(cl-defgeneric smtpmail-try-auth-method (_process mech _user _password)
"Perform authentication of type MECH for USER with PASSWORD.