Re: [PATCH] Fix mml-quoting in responses where pgp-signing is enabled

diff --git a/8c/8c8ade05c2cf1afb7e4183cd586f14300ff89e b/8c/8c8ade05c2cf1afb7e4183cd586f14300ff89e
new file mode 100644 (file)
index 0000000..151af84
--- /dev/null
+++ b/8c/8c8ade05c2cf1afb7e4183cd586f14300ff89e
@@ -0,0 +1,113 @@
+Return-Path: <tbielawa@redhat.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 62D14431FAF\r
+       for <notmuch@notmuchmail.org>; Sat,  3 Mar 2012 15:17:29 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -4.99\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-4.99 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_HI=-5, T_MIME_NO_TEXT=0.01] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id rqSL2QTrAPYa for <notmuch@notmuchmail.org>;\r
+       Sat,  3 Mar 2012 15:17:28 -0800 (PST)\r
+Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28])\r
+       by olra.theworths.org (Postfix) with ESMTP id 9B618431FAE\r
+       for <notmuch@notmuchmail.org>; Sat,  3 Mar 2012 15:17:28 -0800 (PST)\r
+Received: from int-mx01.intmail.prod.int.phx2.redhat.com\r
+       (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\r
+       by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q23NHR8T008136\r
+       (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)\r
+       for <notmuch@notmuchmail.org>; Sat, 3 Mar 2012 18:17:27 -0500\r
+Received: from dehydrator.rdu.redhat.com (spatula.rdu.redhat.com\r
+       [10.11.95.223])\r
+       by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP\r
+       id q23NHRuZ024813\r
+       (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)\r
+       for <notmuch@notmuchmail.org>; Sat, 3 Mar 2012 18:17:27 -0500\r
+Received: from dehydrator.spatula.rdu.redhat.com (localhost [127.0.0.1])\r
+       by dehydrator.rdu.redhat.com (Postfix) with ESMTP id CB66D23347\r
+       for <notmuch@notmuchmail.org>; Sat,  3 Mar 2012 18:17:26 -0500 (EST)\r
+Received: (from tbielawa@localhost)\r
+       by dehydrator.spatula.rdu.redhat.com (8.14.5/8.14.5/Submit) id\r
+       q23NHQ9e011666; Sat, 3 Mar 2012 18:17:26 -0500\r
+X-Authentication-Warning: dehydrator.spatula.rdu.redhat.com: tbielawa set\r
+       sender to tbielawa@redhat.com using -f\r
+From: Tim Bielawa <tbielawa@redhat.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] Fix mml-quoting in responses where pgp-signing is enabled\r
+In-Reply-To: <1330812262-28272-1-git-send-email-tbielawa@redhat.com>\r
+References: <1330812262-28272-1-git-send-email-tbielawa@redhat.com>\r
+User-Agent: Notmuch/0.12~rc1 (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-redhat-linux-gnu)\r
+Date: Sat, 03 Mar 2012 18:17:19 -0500\r
+Message-ID: <871up946m8.fsf@dehydrator.spatula.rdu.redhat.com>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+       micalg=pgp-sha1; protocol="application/pgp-signature"\r
+X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 03 Mar 2012 23:17:29 -0000\r
+\r
+--=-=-=\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Sat,  3 Mar 2012 17:04:22 -0500, Tim Bielawa <tbielawa@redhat.com> wrote:\r
+> The addition of mml-quote-region (notmuch-mua.el) in 2c6710e3 breaks\r
+> automatic signing in replies. When replies are mml-quoted and signing\r
+> is enabled by default the "<#part sign=3Dpgpmime>" string will appear on\r
+> line 1. This will be consumed during the application of the\r
+> mml-quote-region function and transform into the inert string\r
+> "<#!part sign=3Dpgpmime>". The result is that responses will no longer\r
+> be signed by default.\r
+>=20\r
+> This fix moves the point forward one line before applying the quoting\r
+> function.\r
+>=20\r
+> Consideration: Clients not signing mail by default. The first line of\r
+> their responses would be skipped when the quoting function is\r
+> applied. This string takes this general form:\r
+>=20\r
+>     On Sat, 03 Mar 2012 12:55:14 -0800, notmuch-request@notmuchmail.org w=\r
+rote:\r
+>=20\r
+> Because the string is generated by notmuch I don't believe this fix\r
+> introduces the possibility for malicious mml commands being omitted\r
+> from the quoting.\r
+\r
+I suppose I should add that when running the unit tests the relevant\r
+parts still pass:\r
+\r
+> PASS   Reply within emacs\r
+> PASS   Quote MML tags in reply\r
+=20\r
+=2D-=20\r
+Tim Bielawa, Software Engineer/Scribe\r
+Production Control Team (RDU)\r
+919.332.6411 Cell | IRC: tbielawa\r
+1BA0 4FAB 4C13 FBA0 A036  4958 AD05 E75E 0333 AE37\r
+\r
+--=-=-=\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+\r
+iEYEARECAAYFAk9Spn8ACgkQrQXnXgMzrjclggCgtvnno2G9p4F2kIB1CzN3eQOk\r
+680An2ms7A+53SDHXL0UGiPncJaYA9hU\r
+=cHbE\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r