From 5e365f1b6778ef8ca3088fd671831670e2ecd653 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 3 Feb 2012 00:01:33 +2000 Subject: [PATCH] [PATCH v4 2/2] emacs: quote MML tags in replies --- 2b/23fe3117965c35bc03eb4f88156afa653ef19a | 127 ++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 2b/23fe3117965c35bc03eb4f88156afa653ef19a diff --git a/2b/23fe3117965c35bc03eb4f88156afa653ef19a b/2b/23fe3117965c35bc03eb4f88156afa653ef19a new file mode 100644 index 000000000..a11761fa1 --- /dev/null +++ b/2b/23fe3117965c35bc03eb4f88156afa653ef19a @@ -0,0 +1,127 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 29874431FAF + for ; Wed, 1 Feb 2012 20:01:59 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.3 +X-Spam-Level: +X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id swv2QBQZEuE8 for ; + Wed, 1 Feb 2012 20:01:58 -0800 (PST) +Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 8EAC7431FAE + for ; Wed, 1 Feb 2012 20:01:58 -0800 (PST) +Received: from zancas.localnet + (fctnnbsc36w-156034071197.pppoe-dynamic.High-Speed.nb.bellaliant.net + [156.34.71.197]) (authenticated bits=0) + by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id q1241u3A010872 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); + Thu, 2 Feb 2012 00:01:56 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.77) + (envelope-from ) + id 1Rsnrw-0003l2-I7; Thu, 02 Feb 2012 00:01:56 -0400 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH v4 2/2] emacs: quote MML tags in replies +Date: Thu, 2 Feb 2012 00:01:33 -0400 +Message-Id: <1328155293-2334-3-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.8.3 +In-Reply-To: <1328155293-2334-1-git-send-email-david@tethera.net> +References: <1328064581-13949-1-git-send-email-dmitry.kurochkin@gmail.com> + <1328155293-2334-1-git-send-email-david@tethera.net> +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Thu, 02 Feb 2012 04:01:59 -0000 + +From: Aaron Ecay + +Emacs message-mode uses certain text strings to indicate how to attach +files to outgoing mail. If these are present in the text of an email, +and a user is tricked into replying to the message, the user’s files +could be exposed. + +Using point-max would include the signature in the quoting as well. +It would probably be fairly odd to want to put an MML tag in one’s +signature, but that doesn’t mean that we should break that usage. +--- + NEWS | 11 +++++++++++ + emacs/notmuch-mua.el | 7 ++++++- + test/emacs | 1 - + 3 files changed, 17 insertions(+), 2 deletions(-) + +diff --git a/NEWS b/NEWS +index 3d2c2a8..a089e67 100644 +--- a/NEWS ++++ b/NEWS +@@ -11,6 +11,17 @@ Fix error handling in python bindings. + exceptions to indicate the error condition. Any subsequent calls + into libnotmuch caused segmentation faults. + ++Quote MML tags in replies ++ ++ MML tags are text codes that Emacs uses to indicate attachments ++ (among other things) in messages being composed. The Emacs ++ interface did not quote MML tags in the quoted text of a reply. ++ User could be tricked into replying to a maliciously formatted ++ message and not editing out the MML tags from the quoted text. This ++ could lead to files from the user's machine being attached to the ++ outgoing message. The Emacs interface now quotes these tags in ++ reply text, so that they do not effect outgoing messages. ++ + + Notmuch 0.11 (2012-01-13) + ========================= +diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el +index 7114e48..768b693 100644 +--- a/emacs/notmuch-mua.el ++++ b/emacs/notmuch-mua.el +@@ -111,7 +111,12 @@ list." + (insert body)) + (set-buffer-modified-p nil) + +- (message-goto-body)) ++ (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))) + + (defun notmuch-mua-forward-message () + (message-forward) +diff --git a/test/emacs b/test/emacs +index 2a2ce28..de100c5 100755 +--- a/test/emacs ++++ b/test/emacs +@@ -274,7 +274,6 @@ EOF + test_expect_equal_file OUTPUT EXPECTED + + test_begin_subtest "Quote MML tags in reply" +-test_subtest_known_broken + message_id='test-emacs-mml-quoting@message.id' + add_message [id]="$message_id" \ + "[subject]='$test_subtest_name'" \ +-- +1.7.8.3 + -- 2.26.2