From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.bugs Subject: bug#52205: Allow configuring multiple mail accounts for smtpmail.el Date: Sun, 19 Dec 2021 21:59:27 +0000 Message-ID: <871r28mf28.fsf@posteo.net> References: <87fsrdmnqx.fsf@posteo.net> <87lf15arwk.fsf@gnus.org> <87bl20bswc.fsf@posteo.net> <87k0gogmgn.fsf@gnus.org> <87pmqg13qp.fsf@posteo.net> <87bl20f4zn.fsf@gnus.org> <87fsratxmq.fsf@posteo.net> <87wnklwtlw.fsf@gnus.org> <87sfv8u41f.fsf@posteo.net> <87ee6s6vow.fsf@gnus.org> <87ee6g71m1.fsf@posteo.net> <87v8zrpam8.fsf@gnus.org> <87bl1eqb5l.fsf@posteo.net> <87bl1cyi8k.fsf@gnus.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="31722"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 52205@debbugs.gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Dec 19 23:00:18 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mz4E5-000868-AN for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 19 Dec 2021 23:00:17 +0100 Original-Received: from localhost ([::1]:43570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mz4E3-0005NN-Ax for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 19 Dec 2021 17:00:15 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:47982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mz4Dq-0005Mx-Vj for bug-gnu-emacs@gnu.org; Sun, 19 Dec 2021 17:00:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:36854) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mz4Dq-0004pl-Mh for bug-gnu-emacs@gnu.org; Sun, 19 Dec 2021 17:00:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mz4Dq-0008E5-Lo for bug-gnu-emacs@gnu.org; Sun, 19 Dec 2021 17:00:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 19 Dec 2021 22:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52205 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 52205-submit@debbugs.gnu.org id=B52205.163995117731561 (code B ref 52205); Sun, 19 Dec 2021 22:00:02 +0000 Original-Received: (at 52205) by debbugs.gnu.org; 19 Dec 2021 21:59:37 +0000 Original-Received: from localhost ([127.0.0.1]:48400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mz4DR-0008Cy-5w for submit@debbugs.gnu.org; Sun, 19 Dec 2021 16:59:37 -0500 Original-Received: from mout02.posteo.de ([185.67.36.66]:34719) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mz4DO-0008Ci-RI for 52205@debbugs.gnu.org; Sun, 19 Dec 2021 16:59:35 -0500 Original-Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 9BECA240101 for <52205@debbugs.gnu.org>; Sun, 19 Dec 2021 22:59:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1639951168; bh=xY4g2lGqVwzPBD4rEjBs7aGmEmL4gVmEnd8hXAmq+t8=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=NmOVYt+zoBidlQAqgof2DZAmgIjZiNhpD+ZeW5Z5mu2QDdg3lmocI4AkVwz+GOr9P wiOMwgoSQBYpA/MbvmbH+QRAZ6jusivA6c1VFZeq1H92EJctUFKuREiQpIsQLwIAnK sjJfuWAQ13Hie3etfkbvUATUvDFoJcKSjTkCqckQ/KYW8BnWY5ZOTC9yybnZrjE+mT iM8f8BmwccgzoRdv8DSl7Orr3MGEsLmksPATeBgvnuGDBHHfYPU8nlqAj+tIlj+aKu kspIyoR/89UeWfir0eXwG05TchEautk3iuLTz5z9YeD91RIg49++CNciUSjLxRTsK7 DqKArDEYeiXqQ== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JHGpR6Mr7z9rxL; Sun, 19 Dec 2021 22:59:27 +0100 (CET) Autocrypt: addr=philipk@posteo.net; prefer-encrypt=nopreference; keydata= mDMEYHHqUhYJKwYBBAHaRw8BAQdAp3GdmYJ6tm5McweY6dEvIYIiry+Oz9rU4MH6NHWK0Ee0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiQBBMWCAA4FiEEDM2H44ZoPt9Ms0eHtVrAHPRh1FwFAmBx6lICGwMFCwkIBwIGFQoJ CAsCBBYCAwECHgECF4AACgkQtVrAHPRh1FyTkgEAjlbGPxFchvMbxzAES3r8QLuZgCxeAXunM9gh io0ePtUBALVhh9G6wIoZhl0gUCbQpoN/UJHI08Gm1qDob5zDxnIHuDgEYHHqUhIKKwYBBAGXVQEF AQEHQNcRB+MUimTMqoxxMMUERpOR+Q4b1KgncDZkhrO2ql1tAwEIB4h4BBgWCAAgFiEEDM2H44Zo Pt9Ms0eHtVrAHPRh1FwFAmBx6lICGwwACgkQtVrAHPRh1Fw1JwD/Qo7kvtib8jy7puyWrSv0MeTS g8qIxgoRWJE/KKdkCLEA/jb9b9/g8nnX+UcwHf/4VfKsjExlnND3FrBviXUW6NcB In-Reply-To: <87bl1cyi8k.fsf@gnus.org> (Lars Ingebrigtsen's message of "Sun, 19 Dec 2021 11:57:47 +0100") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:222755 Archived-At: --=-=-= Content-Type: text/plain Lars Ingebrigtsen writes: > Philip Kaludercic writes: > >>>>> Or we could add a command like `message-update-smtp-method-header' and >>>>> people could call that (or add it to their hooks) after altering their >>>>> From (or whatever) headers. >>>> >>>> So if the mechanism is supposed to be kept general (instead of just >>>> checking the From header), how would this differ from the already >>>> existing message-send-mail-hook? >>> >>> How a command would differ from a hook? I'm not sure I understand the >>> question. >> >> Oh, sorry I misunderstood your suggestion. So you are thinking of >> something that would be configured like: >> >> ;; `message-server-alist' would match the From header[0] if it is a string, >> ;; or call a function in the current message buffer if it is a function. >> (setq message-server-alist >> '(("foo@mail.com" . "smtp.mail.com") >> ("bar@post.de" . "post-spuep.de"))) >> >> (add-hook 'message-send-mail-hook #'message-update-smtp-method-header) > > No, I meant: > >>>>> Or we could add a command like `message-update-smtp-method-header' and >>>>> people could call that > >> If so, then couldn't the add-hook just be dropped, and message always >> checks message-server-alist before sending a message? > > Yes. Ok, so how does this look like? --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Automatically-insert-X-Message-SMTP-Method-headers.patch >From c1dec09a725b440380a01c71435b24fc4cd905c0 Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Sun, 19 Dec 2021 22:53:59 +0100 Subject: [PATCH] Automatically insert X-Message-SMTP-Method headers * message.el (message-server-alist): Add user option (message-update-smtp-method-header): Add function (message-send): Call message-update-smtp-method-header --- lisp/gnus/message.el | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 285369b84c..24a12af3c9 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1,4 +1,4 @@ -;;; message.el --- composing mail and news messages -*- lexical-binding: t -*- +;;; message.el --- composing mail and news messages -*- lexical- t -*- ;; Copyright (C) 1996-2021 Free Software Foundation, Inc. @@ -4335,6 +4335,43 @@ message-bury (autoload 'mml-secure-bcc-is-safe "mml-sec") +(defcustom message-server-alist nil + "Alist of rules to generate \"X-Message-SMTP-Method\" headers. +If any entry of the form (COND . METHOD) matches, the header will +be inserted just before the message is sent. If COND is a +string, METHOD will be inserted if the \"From\" header matches +COND. If COND is a function, METHOD will be inserted if COND +returns a non-nil value, when called in the message buffer +without any arguments. If METHOD is nil in the last case, the +return value of the function will be returned instead. None of +this applies if the buffer already has a\"X-Message-SMTP-Method\" +header." + :type '(alist :key-type '(choice + (string :tag "From Address") + (function :tag "Predicate")) + :value-type 'string) + :version "29.1" + :group 'message-sending) + +(defun message-update-smtp-method-header () + "Check `message-server-alist' to insert a SMTP-Method header." + (unless (message-fetch-field "X-Message-SMTP-Method") + (let ((from (mail-extract-address-components (message-fetch-field "From"))) + method) + (catch 'exit + (dolist (server message-server-alist) + (cond ((functionp (car server)) + (let ((res (funcall (car server)))) + (when res + (setq method (or (cdr server) res)) + (throw 'exit nil)))) + ((and (stringp (car server)) + (string= (car server) from)) + (setq method (cdr server)) + (throw 'exit nil))))) + (when method + (message-add-header (concat "X-Message-SMTP-Method: " method)))))) + (defun message-send (&optional arg) "Send the message in the current buffer. If `message-interactive' is non-nil, wait for success indication or @@ -4348,6 +4385,7 @@ message-send (undo-boundary) (let ((inhibit-read-only t)) (put-text-property (point-min) (point-max) 'read-only nil)) + (message-update-smtp-method-header) (message-fix-before-sending) (run-hooks 'message-send-hook) (mml-secure-bcc-is-safe) -- 2.30.2 --=-=-= Content-Type: text/plain This calls message-update-smtp-method-header before message-send-hook, but I could also see adding message-update-smtp-method-header to the hook in message.el, so that a user may remove it if needed. -- Philip Kaludercic --=-=-=--