From: Tim Bielawa <tbielawa@redhat.com>
To: notmuch@notmuchmail.org
Subject: [PATCH] Fix mml-quoting in responses where pgp-signing is enabled
Date: Sat, 3 Mar 2012 17:04:22 -0500 [thread overview]
Message-ID: <1330812262-28272-1-git-send-email-tbielawa@redhat.com> (raw)
The addition of mml-quote-region (notmuch-mua.el) in 2c6710e3 breaks
automatic signing in replies. When replies are mml-quoted and signing
is enabled by default the "<#part sign=pgpmime>" string will appear on
line 1. This will be consumed during the application of the
mml-quote-region function and transform into the inert string
"<#!part sign=pgpmime>". The result is that responses will no longer
be signed by default.
This fix moves the point forward one line before applying the quoting
function.
Consideration: Clients not signing mail by default. The first line of
their responses would be skipped when the quoting function is
applied. This string takes this general form:
On Sat, 03 Mar 2012 12:55:14 -0800, notmuch-request@notmuchmail.org wrote:
Because the string is generated by notmuch I don't believe this fix
introduces the possibility for malicious mml commands being omitted
from the quoting.
---
emacs/notmuch-mua.el | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 4be7c13..d8ab2c0 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -114,14 +114,25 @@ list."
(goto-char (point-max)))
(insert body)
(push-mark))
- (set-buffer-modified-p nil)
(message-goto-body)
;; Original message may contain (malicious) MML tags. We must
;; properly quote them in the reply. Note that using `point-max'
;; instead of `mark' here is wrong. The buffer may include user's
;; signature which should not be MML-quoted.
- (mml-quote-region (point) (mark)))
+ ;;
+ ;; Note also that we skip the first line of the response as it is
+ ;; either: the "<#part sign=pgpmime>" string when clients use
+ ;; automatic signing, or it is the generated string from notmuch
+ ;; indicating the date and author of the message which is being
+ ;; responded to, "on date x, y z -0000, foo@bar.com wrote:"
+ (forward-line 1)
+ (mml-quote-region (point) (mark))
+
+ ;; Quoting the message may modify the contents of the buffer,
+ ;; however, we shouldn't consider mml-quoting a modification because
+ ;; it's preformed by the mua, not the user.
+ (set-buffer-modified-p nil))
(defun notmuch-mua-forward-message ()
(message-forward)
--
1.7.4.4
next reply other threads:[~2012-03-03 22:04 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-03 22:04 Tim Bielawa [this message]
2012-03-03 23:17 ` [PATCH] Fix mml-quoting in responses where pgp-signing is enabled Tim Bielawa
2012-03-03 23:36 ` Jani Nikula
2012-03-04 1:12 ` Tim Bielawa
2012-03-04 8:25 ` [PATCH] emacs: fix MML quoting in replies Jani Nikula
2012-03-05 0:41 ` Mark Walters
2012-03-10 14:57 ` Tomi Ollila
2012-03-11 1:50 ` David Bremner
2012-03-14 22:08 ` Austin Clements
2012-03-15 6:33 ` Jani Nikula
-- strict thread matches above, loose matches on Subject: below --
2012-03-03 23:54 [PATCH] Fix mml-quoting in responses where pgp-signing is enabled Tim Bielawa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330812262-28272-1-git-send-email-tbielawa@redhat.com \
--to=tbielawa@redhat.com \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).