diff options
| author | Xiyue Deng <manphiz@gmail.com> | 2025-05-16 02:48:52 -0700 |
|---|---|---|
| committer | Robert Pluim <rpluim@gmail.com> | 2025-06-03 14:44:59 +0200 |
| commit | 41f8dc18dfdb003dbcd27f619960f2533a02fde2 (patch) | |
| tree | 8ac055a75ce286ece1263636ef17cbc6ea6a7b18 /lisp/mail | |
| parent | cd57a05542bd9cc5b9866d2b6b15d5125cf9e40e (diff) | |
Make xoauth2 auth fail when a smtp server replies 334 (Bug#78366)
* lisp/mail/smtpmail.el (smtpmail-try-auth-method): Throw error 535
when receiving a "334 server challenge" reply.
(cherry picked from commit 53371c959462a677a29ee869b3b6627facf3ed79)
Diffstat (limited to 'lisp/mail')
| -rw-r--r-- | lisp/mail/smtpmail.el | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index dcec0b1d9e9..dc3293fb2f4 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -639,11 +639,21 @@ USER and PASSWORD should be non-nil." (cl-defmethod smtpmail-try-auth-method (process (_mech (eql 'xoauth2)) user password) - (smtpmail-command-or-throw - process - (concat "AUTH XOAUTH2 " - (base64-encode-string - (concat "user=" user "\1auth=Bearer " password "\1\1") t)))) + (let ((ret (smtpmail-command-or-throw + process + (concat "AUTH XOAUTH2 " + (base64-encode-string + (concat "user=" user "\1auth=Bearer " password "\1\1") + t))))) + (if (eq (car ret) 334) + ;; When a server returns 334 server challenge, it usually means + ;; the credentials it received were wrong (e.g. was an actual + ;; password instead of an access token). In such a case, we + ;; should return a string with 535 to indicate a failure so that + ;; smtpmail will try other authentication mechanisms. See also + ;; https://debbugs.gnu.org/78366. + (throw 'done "535 5.7.8 Authentication credentials invalid") + ret))) (defun smtpmail-response-code (string) (when string |