From: Lars Ingebrigtsen Date: Wed, 19 Jan 2022 18:10:45 +0000 (+0100) Subject: Tweak the previous suspicious Message change X-Git-Tag: emacs-29.0.90~2930 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=775faf6efaa2a6ee8d9cee3600e6715b02060f0b;p=emacs.git Tweak the previous suspicious Message change * lisp/gnus/message.el (message-check-recipients) (message-send-mail): Move the check to after encoding. --- diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 1f47e696c30..c1afe3043ef 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -4663,12 +4663,6 @@ This function could be useful in `message-setup-hook'." (format "Email address %s looks invalid; send anyway?" address)) (user-error "Invalid address %s" address)))) - ;; Then check for suspicious addresses. - (dolist (address (mail-header-parse-addresses addr t)) - (when-let ((warning (textsec-check address 'email-address-header))) - (unless (y-or-n-p - (format "Suspicious address: %s; send anyway?" warning)) - (user-error "Suspicious address %s" address)))) ;; Then check for likely-bogus addresses. (dolist (bog (message-bogus-recipient-p addr)) (and bog @@ -4907,7 +4901,18 @@ If you always want Gnus to send messages in one piece, set (message-generate-headers '(Lines))) ;; Remove some headers. (message-remove-header message-ignored-mail-headers t) - (mail-encode-encoded-word-buffer)) + (mail-encode-encoded-word-buffer) + ;; Then check for suspicious addresses. + (dolist (hdr '("To" "Cc" "Bcc")) + (let ((addr (message-fetch-field hdr))) + (when (stringp addr) + (dolist (address (mail-header-parse-addresses addr t)) + (when-let ((warning (textsec-check address + 'email-address-header))) + (unless (y-or-n-p + (format "Suspicious address: %s; send anyway?" + warning)) + (user-error "Suspicious address %s" address)))))))) (goto-char (point-max)) ;; require one newline at the end. (or (= (preceding-char) ?\n)