1 Return-Path: <amdragon@mit.edu>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 67914431FAF
\r
6 for <notmuch@notmuchmail.org>; Wed, 14 Mar 2012 15:08:11 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id fpYRoe7Gsagu for <notmuch@notmuchmail.org>;
\r
16 Wed, 14 Mar 2012 15:08:10 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id B4BD4431FAE
\r
20 for <notmuch@notmuchmail.org>; Wed, 14 Mar 2012 15:08:10 -0700 (PDT)
\r
21 X-AuditID: 1209190d-b7fbf6d0000008ba-19-4f6116c8f306
\r
22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])
\r
23 by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id 2C.76.02234.8C6116F4; Wed, 14 Mar 2012 18:08:08 -0400 (EDT)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q2EM87P8013018;
\r
27 Wed, 14 Mar 2012 18:08:08 -0400
\r
28 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])
\r
29 (authenticated bits=0)
\r
30 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
31 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q2EM85X9029698
\r
32 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
33 Wed, 14 Mar 2012 18:08:06 -0400 (EDT)
\r
34 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)
\r
35 (envelope-from <amdragon@mit.edu>)
\r
36 id 1S7wMX-0000rs-O4; Wed, 14 Mar 2012 18:08:05 -0400
\r
37 From: Austin Clements <amdragon@MIT.EDU>
\r
38 To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org
\r
39 Subject: Re: [PATCH] emacs: fix MML quoting in replies
\r
40 In-Reply-To: <1330849538-24558-1-git-send-email-jani@nikula.org>
\r
41 References: <87fwdptbir.fsf@dehydrator.spatula.rdu.redhat.com>
\r
42 <1330849538-24558-1-git-send-email-jani@nikula.org>
\r
43 User-Agent: Notmuch/0.11.1+252~gdf1a6d5 (http://notmuchmail.org) Emacs/23.3.1
\r
45 Date: Wed, 14 Mar 2012 18:08:05 -0400
\r
46 Message-ID: <87k42momyi.fsf@awakening.csail.mit.edu>
\r
48 Content-Type: text/plain; charset=us-ascii
\r
49 X-Brightmail-Tracker:
\r
50 H4sIAAAAAAAAA+NgFnrAIsWRmVeSWpSXmKPExsUixCmqrXtCLNHfYNU3LYum6c4W12/OZHZg
\r
51 8rh1/zW7x7NVt5gDmKK4bFJSczLLUov07RK4Mpbe6GUsaOCpePVpLlsD40XOLkZODgkBE4mv
\r
52 q6+xQdhiEhfurQeyuTiEBPYxShxc8QrK2cAo8WT/elYI5ySTxJIpj6AySxglnj6/xQzSzyag
\r
53 IbFt/3JGEFtEwEri3MPXLCC2sICZxKrmw0wgNqeAg8TLXZuBajiAmoskNu4UAQmLCiRKrO+8
\r
54 D1bCIqAqMfvIbLCRvEDnTT9xhBXCFpQ4OfMJ2EhmAS2JG/9eMk1gFJiFJDULSWoBI9MqRtmU
\r
55 3Crd3MTMnOLUZN3i5MS8vNQiXSO93MwSvdSU0k2M4ICU5N3B+O6g0iFGAQ5GJR7erPp4fyHW
\r
56 xLLiytxDjJIcTEqivL1cif5CfEn5KZUZicUZ8UWlOanFhxglOJiVRHhNQXK8KYmVValF+TAp
\r
57 aQ4WJXFeVa13fkIC6YklqdmpqQWpRTBZGQ4OJQneBlGgRsGi1PTUirTMnBKENBMHJ8hwHqDh
\r
58 fCIgw4sLEnOLM9Mh8qcYFaXEeXmBMS8kAJLIKM2D64UljFeM4kCvCPO+EAaq4gEmG7juV0CD
\r
59 mYAGl3yLAxlckoiQkmpgTAvxD/wSciYw/Jtze2GmisCmlmdZPDNz7169r+a/bNXlFt8mG1eL
\r
60 I98Yl8t+7Vy6+5ef/8UXmQv5RVokgpMr+aclMe0Iuac1I2nJcoHuGQzlcWkrP66ocbENv/5c
\r
61 6m3VooWpT1/oW3/eG3Bcaa6a9O4n6YqObjsefxD0eCgtGSjxzXDBpsVvlViKMxINtZiLihMB
\r
63 X-BeenThere: notmuch@notmuchmail.org
\r
64 X-Mailman-Version: 2.1.13
\r
66 List-Id: "Use and development of the notmuch mail system."
\r
67 <notmuch.notmuchmail.org>
\r
68 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
69 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
70 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
71 List-Post: <mailto:notmuch@notmuchmail.org>
\r
72 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
73 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
74 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
75 X-List-Received-Date: Wed, 14 Mar 2012 22:08:11 -0000
\r
77 On Sun, 4 Mar 2012 10:25:38 +0200, Jani Nikula <jani@nikula.org> wrote:
\r
78 > The reply MML quoting added in commit ae438cc unintentionally MML
\r
79 > quotes also the signature/encryption MML tags added via
\r
80 > message-setup-hook, causing the reply not to be signed/encrypted.
\r
82 > MML quote just the original message in the temp buffer before
\r
83 > inserting it to the message buffer, to not interfere with message mode
\r
84 > hooks or message construction in general.
\r
86 > See [1] and [2] for bug reports.
\r
88 > Thanks to Tim Bielawa <tbielawa@redhat.com> for testing.
\r
90 > [1] id:"87hay78x6l.fsf@wyzanski.jamesvasile.com"
\r
91 > [2] id:"1330812262-28272-1-git-send-email-tbielawa@redhat.com".
\r
93 > Signed-off-by: Jani Nikula <jani@nikula.org>
\r
95 > emacs/notmuch-mua.el | 10 ++++------
\r
96 > 1 files changed, 4 insertions(+), 6 deletions(-)
\r
98 > diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
\r
99 > index 4be7c13..13244eb 100644
\r
100 > --- a/emacs/notmuch-mua.el
\r
101 > +++ b/emacs/notmuch-mua.el
\r
102 > @@ -95,6 +95,9 @@ list."
\r
103 > (goto-char (point-min))
\r
104 > (setq headers (mail-header-extract)))))
\r
106 > + ;; Original message may contain (malicious) MML tags. We must
\r
107 > + ;; properly quote them in the reply.
\r
108 > + (mml-quote-region (point) (point-max))
\r
110 Under what circumstances can the (re-search-forward "^$" nil t) above
\r
111 this code fail? If it does fail, is it possible for the (forward-line 1)
\r
112 to move past an adversary-controlled line of text and fail to quote that
\r