debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: Add a defcustom that specifies regexp for blocked remote images.

Browse source 
It's default value is ".", meaning all remote images will be blocked
by default.
This commit is contained in:
Jinwoo Lee 2015-02-02 13:04:52 -08:00 committed by David Bremner
parent b74ed1cfad
commit 2049205e09
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
emacs/notmuch-show.el
View file

@ -136,6 +136,13 @@ indentation."
:type 'boolean :type 'boolean
:group 'notmuch-show) :group 'notmuch-show)
;; By default, block all external images to prevent privacy leaks and
;; potential attacks.
(defcustom notmuch-show-text/html-blocked-images "."
"Remote images that have URLs matching this regexp will be blocked."
:type '(choice (const nil) regexp)
:group 'notmuch-show)
(defvar notmuch-show-thread-id nil) (defvar notmuch-show-thread-id nil)
(make-variable-buffer-local 'notmuch-show-thread-id) (make-variable-buffer-local 'notmuch-show-thread-id)
(put 'notmuch-show-thread-id 'permanent-local t) (put 'notmuch-show-thread-id 'permanent-local t)
@ -771,14 +778,21 @@ will return nil if the CID is unknown or cannot be retrieved."
;; It's easier to drive shr ourselves than to work around the ;; It's easier to drive shr ourselves than to work around the
;; goofy things `mm-shr' does (like irreversibly taking over ;; goofy things `mm-shr' does (like irreversibly taking over
;; content ID handling). ;; content ID handling).
(notmuch-show--insert-part-text/html-shr msg part)
;; FIXME: If we block an image, offer a button to load external
;; images.
(let ((shr-blocked-images notmuch-show-text/html-blocked-images))
(notmuch-show--insert-part-text/html-shr msg part))
;; Otherwise, let message-mode do the heavy lifting ;; Otherwise, let message-mode do the heavy lifting
;; ;;
;; w3m sets up a keymap which "leaks" outside the invisible region ;; w3m sets up a keymap which "leaks" outside the invisible region
;; and causes strange effects in notmuch. We set ;; and causes strange effects in notmuch. We set
;; mm-inline-text-html-with-w3m-keymap to nil to tell w3m not to ;; mm-inline-text-html-with-w3m-keymap to nil to tell w3m not to
;; set a keymap (so the normal notmuch-show-mode-map remains). ;; set a keymap (so the normal notmuch-show-mode-map remains).
(let ((mm-inline-text-html-with-w3m-keymap nil)) (let ((mm-inline-text-html-with-w3m-keymap nil)
;; FIXME: If we block an image, offer a button to load external
;; images.
(gnus-blocked-images notmuch-show-text/html-blocked-images))
(notmuch-show-insert-part-*/* msg part content-type nth depth button)))) (notmuch-show-insert-part-*/* msg part content-type nth depth button))))
;; These functions are used by notmuch-show--insert-part-text/html-shr ;; These functions are used by notmuch-show--insert-part-text/html-shr
@ -797,11 +811,7 @@ will return nil if the CID is unknown or cannot be retrieved."
;; shr strips the "cid:" part of URL, but doesn't ;; shr strips the "cid:" part of URL, but doesn't
;; URL-decode it (see RFC 2392). ;; URL-decode it (see RFC 2392).
(let ((cid (url-unhex-string url))) (let ((cid (url-unhex-string url)))
(first (notmuch-show--get-cid-content cid))))) (first (notmuch-show--get-cid-content cid))))))
;; Block all external images to prevent privacy leaks and
;; potential attacks. FIXME: If we block an image, offer a
;; button to load external images.
(shr-blocked-images "."))
(shr-insert-document dom) (shr-insert-document dom)
t)) t))