--- /dev/null
+Return-Path: <jinwoo68@gmail.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 20BCF431FC4\r
+ for <notmuch@notmuchmail.org>; Thu, 29 Jan 2015 13:36:23 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.639\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.639 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ DNS_FROM_AHBL_RHSBL=2.438, FREEMAIL_ENVFROM_END_DIGIT=1,\r
+ FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 libfKoN6EPI3 for <notmuch@notmuchmail.org>;\r
+ Thu, 29 Jan 2015 13:36:20 -0800 (PST)\r
+Received: from mail-pa0-f41.google.com (mail-pa0-f41.google.com\r
+ [209.85.220.41]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id C85E9431FBC\r
+ for <notmuch@notmuchmail.org>; Thu, 29 Jan 2015 13:36:19 -0800 (PST)\r
+Received: by mail-pa0-f41.google.com with SMTP id kq14so43723660pab.0\r
+ for <notmuch@notmuchmail.org>; Thu, 29 Jan 2015 13:36:19 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id;\r
+ bh=qLPydc38mDxPE4hG3UjhLo4rMJGp8SlqNTTdoLtV0Ts=;\r
+ b=yvsicgRiQpkq+XJ+2qjqRTdQO8dLK2UAd1FcxGFp3dP6WsQEjh/5XIOmu7NKr61/N4\r
+ SwLz49IrAnY+XR00unBgon5JzgMqbLT5u2Y+gDfyH+7lu+7+G7w4fwvdVXjZnYEwuNts\r
+ v7K4VdkKP7/5qloEiTDwMb4/Yd/dFEUFYQSyn1CKO8jTE/jkeNHa2ZDl9qBxMBHzeYfw\r
+ /4PngWEz37uGWTcvFubavEH00Mm4yoA7XxZzPs7FqsizkTnSjs8iwdUuJ0d2OSMENU5X\r
+ y05Lv3as0ctNOcDwbaShfldFbICyweZv+ZmvgcBceXhQl+LG6QgqqXMcHJYemjaUbGJm\r
+ uPtQ==\r
+X-Received: by 10.66.62.138 with SMTP id y10mr3808929par.51.1422567379160;\r
+ Thu, 29 Jan 2015 13:36:19 -0800 (PST)\r
+Received: from jinwoo-macbookair.roam.corp.google.com.net ([24.130.61.213])\r
+ by mx.google.com with ESMTPSA id bq7sm8687628pdb.50.2015.01.29.13.36.18\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\r
+ Thu, 29 Jan 2015 13:36:18 -0800 (PST)\r
+From: Jinwoo Lee <jinwoo68@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: Add a defcustom that specifies regexp for blocked\r
+ remote images.\r
+Date: Thu, 29 Jan 2015 13:35:52 -0800\r
+Message-Id: <1422567352-32647-1-git-send-email-jinwoo68@gmail.com>\r
+X-Mailer: git-send-email 2.2.2\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: Thu, 29 Jan 2015 21:36:24 -0000\r
+\r
+It's default value is ".", meaning all remote images will be blocked\r
+by default.\r
+\r
+---\r
+This time setting gnus-blocked-images from the correct place.\r
+---\r
+ emacs/notmuch-show.el | 23 ++++++++++++++++++-----\r
+ 1 file changed, 18 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 66350d4..6f38e0c 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -136,6 +136,11 @@ indentation."\r
+ :type 'boolean\r
+ :group 'notmuch-show)\r
+ \r
++(defcustom notmuch-show-text/html-blocked-images "."\r
++ "Remote images that have URLs matching this regexp will be blocked."\r
++ :type '(choice (const nil) regexp)\r
++ :group 'notmuch-show)\r
++\r
+ (defvar notmuch-show-thread-id nil)\r
+ (make-variable-buffer-local 'notmuch-show-thread-id)\r
+ (put 'notmuch-show-thread-id 'permanent-local t)\r
+@@ -798,16 +803,24 @@ will return nil if the CID is unknown or cannot be retrieved."\r
+ ;; URL-decode it (see RFC 2392).\r
+ (let ((cid (url-unhex-string url)))\r
+ (first (notmuch-show--get-cid-content cid)))))\r
+- ;; Block all external images to prevent privacy leaks and\r
+- ;; potential attacks. FIXME: If we block an image, offer a\r
+- ;; button to load external images.\r
+- (shr-blocked-images "."))\r
++ ;; By default, block all external images to prevent privacy\r
++ ;; leaks and potential attacks. FIXME: If we block an image,\r
++ ;; offer a button to load external images.\r
++ (shr-blocked-images notmuch-show-text/html-blocked-images))\r
+ (shr-insert-document dom)\r
+ t))\r
+ \r
+ (defun notmuch-show-insert-part-*/* (msg part content-type nth depth button)\r
+ ;; This handler _must_ succeed - it is the handler of last resort.\r
+- (notmuch-mm-display-part-inline msg part content-type notmuch-show-process-crypto)\r
++\r
++ ;; By default, block all external images to prevent privacy leaks\r
++ ;; and potential attacks. FIXME: If we block an image, offer a\r
++ ;; button to load external images.\r
++ ;; Note that GNUS-BLOCKED-IMAGES is effective only when\r
++ ;; MM-TEXT-HTML-RENDERER is 'gnus-w3m.\r
++ (let ((gnus-blocked-images notmuch-show-text/html-blocked-images))\r
++ (notmuch-mm-display-part-inline msg part content-type\r
++ notmuch-show-process-crypto))\r
+ t)\r
+ \r
+ ;; Functions for determining how to handle MIME parts.\r
+-- \r
+2.2.2\r
+\r
projects / notmuch-archives.git / commitdiff