1 Return-Path: <jinwoo68@gmail.com>
\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 2B216431FAE
\r
6 for <notmuch@notmuchmail.org>; Fri, 30 Jan 2015 16:10:21 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=2.639 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 DNS_FROM_AHBL_RHSBL=2.438, FREEMAIL_ENVFROM_END_DIGIT=1,
\r
14 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id xzD+f9eHoth8 for <notmuch@notmuchmail.org>;
\r
18 Fri, 30 Jan 2015 16:10:18 -0800 (PST)
\r
19 Received: from mail-ie0-f170.google.com (mail-ie0-f170.google.com
\r
20 [209.85.223.170]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
21 (No client certificate requested)
\r
22 by olra.theworths.org (Postfix) with ESMTPS id 3CFE8431FC4
\r
23 for <notmuch@notmuchmail.org>; Fri, 30 Jan 2015 16:10:18 -0800 (PST)
\r
24 Received: by mail-ie0-f170.google.com with SMTP id y20so7087526ier.1
\r
25 for <notmuch@notmuchmail.org>; Fri, 30 Jan 2015 16:10:15 -0800 (PST)
\r
26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
27 h=from:to:subject:in-reply-to:references:user-agent:date:message-id
\r
28 :mime-version:content-type;
\r
29 bh=lkBbgu9UR/07YPbe6Kh2SYksFFtiYb7o8rb4pDDfFv0=;
\r
30 b=0FnIW7BFnSJdcT5oec6Se3uVi9r6/xtq3nL7qtwtbXU4G//zJwd9998uPSwIaUrm45
\r
31 elZHN6hWg50kmpSHUT7HR14PR+tPPgh0IHEnjnSU5AjEY96g9AWUa28xx891kkws9rNp
\r
32 NkaaPLjxXfJLMxm1E9k0F69NWs0ePbBjoNN+b7aFw9Gw6OqZb+g+3yWlrJoG7UO7ajwY
\r
33 V5a6I1XTwrPNc10PKfUXWykPtoUDtAf5LNWzvJUWcwX9m54ymuyhGoBDoaaa35lX6Mf0
\r
34 Nxz2x8fFnb1rpx5vDMEMuemGRsEexJsS6l8+JAQs7O+sn04g0Fl57XfqL3dlvZxKLUQq
\r
36 X-Received: by 10.50.111.168 with SMTP id ij8mr95774igb.43.1422663015695;
\r
37 Fri, 30 Jan 2015 16:10:15 -0800 (PST)
\r
38 Received: from localhost ([2620:0:1000:407c:4567:58c3:e7ba:87a3])
\r
39 by mx.google.com with ESMTPSA id qr1sm2024572igb.18.2015.01.30.16.10.14
\r
40 for <notmuch@notmuchmail.org>
\r
41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
\r
42 Fri, 30 Jan 2015 16:10:15 -0800 (PST)
\r
43 From: Jinwoo Lee <jinwoo68@gmail.com>
\r
44 To: notmuch@notmuchmail.org
\r
45 Subject: Re: [PATCH] emacs: Add a defcustom that specifies regexp for blocked
\r
47 In-Reply-To: <1422567352-32647-1-git-send-email-jinwoo68@gmail.com>
\r
48 References: <1422567352-32647-1-git-send-email-jinwoo68@gmail.com>
\r
49 User-Agent: Notmuch/0.18.1 (http://notmuchmail.org) Emacs/24.4.1
\r
50 (x86_64-apple-darwin13.2.0)
\r
51 Date: Fri, 30 Jan 2015 16:10:12 -0800
\r
52 Message-ID: <yq65fvaru7x7.fsf@jinwoo-macbookair.roam.corp.google.com>
\r
54 Content-Type: text/plain
\r
55 X-BeenThere: notmuch@notmuchmail.org
\r
56 X-Mailman-Version: 2.1.13
\r
58 List-Id: "Use and development of the notmuch mail system."
\r
59 <notmuch.notmuchmail.org>
\r
60 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
61 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
62 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
63 List-Post: <mailto:notmuch@notmuchmail.org>
\r
64 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
65 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
66 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
67 X-List-Received-Date: Sat, 31 Jan 2015 00:10:21 -0000
\r
69 Can someone take a look please?
\r
71 On Thu, Jan 29, 2015 at 01:35 PM, Jinwoo Lee <jinwoo68@gmail.com> wrote:
\r
72 > It's default value is ".", meaning all remote images will be blocked
\r
76 > This time setting gnus-blocked-images from the correct place.
\r
78 > emacs/notmuch-show.el | 23 ++++++++++++++++++-----
\r
79 > 1 file changed, 18 insertions(+), 5 deletions(-)
\r
81 > diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
\r
82 > index 66350d4..6f38e0c 100644
\r
83 > --- a/emacs/notmuch-show.el
\r
84 > +++ b/emacs/notmuch-show.el
\r
85 > @@ -136,6 +136,11 @@ indentation."
\r
87 > :group 'notmuch-show)
\r
89 > +(defcustom notmuch-show-text/html-blocked-images "."
\r
90 > + "Remote images that have URLs matching this regexp will be blocked."
\r
91 > + :type '(choice (const nil) regexp)
\r
92 > + :group 'notmuch-show)
\r
94 > (defvar notmuch-show-thread-id nil)
\r
95 > (make-variable-buffer-local 'notmuch-show-thread-id)
\r
96 > (put 'notmuch-show-thread-id 'permanent-local t)
\r
97 > @@ -798,16 +803,24 @@ will return nil if the CID is unknown or cannot be retrieved."
\r
98 > ;; URL-decode it (see RFC 2392).
\r
99 > (let ((cid (url-unhex-string url)))
\r
100 > (first (notmuch-show--get-cid-content cid)))))
\r
101 > - ;; Block all external images to prevent privacy leaks and
\r
102 > - ;; potential attacks. FIXME: If we block an image, offer a
\r
103 > - ;; button to load external images.
\r
104 > - (shr-blocked-images "."))
\r
105 > + ;; By default, block all external images to prevent privacy
\r
106 > + ;; leaks and potential attacks. FIXME: If we block an image,
\r
107 > + ;; offer a button to load external images.
\r
108 > + (shr-blocked-images notmuch-show-text/html-blocked-images))
\r
109 > (shr-insert-document dom)
\r
112 > (defun notmuch-show-insert-part-*/* (msg part content-type nth depth button)
\r
113 > ;; This handler _must_ succeed - it is the handler of last resort.
\r
114 > - (notmuch-mm-display-part-inline msg part content-type notmuch-show-process-crypto)
\r
116 > + ;; By default, block all external images to prevent privacy leaks
\r
117 > + ;; and potential attacks. FIXME: If we block an image, offer a
\r
118 > + ;; button to load external images.
\r
119 > + ;; Note that GNUS-BLOCKED-IMAGES is effective only when
\r
120 > + ;; MM-TEXT-HTML-RENDERER is 'gnus-w3m.
\r
121 > + (let ((gnus-blocked-images notmuch-show-text/html-blocked-images))
\r
122 > + (notmuch-mm-display-part-inline msg part content-type
\r
123 > + notmuch-show-process-crypto))
\r
126 > ;; Functions for determining how to handle MIME parts.
\r