mh-x-image-url-sane-p: accept "https" URLs

* lisp/mh-e/mh-xface.el (mh-x-image-url-sane-p): Accept https URLs.
* test/lisp/mh-e/mh-xface.el: New file, to test mh-x-image-url-sane-p.
This commit is contained in:
Stephen Gildea 2021-08-21 17:25:46 -07:00
parent 5f1ee1f8e6
commit aa27c42cf9
2 changed files with 41 additions and 4 deletions

View file

@ -391,10 +391,12 @@ filenames. In addition, replaces * with %2a. See URL
(defun mh-x-image-url-sane-p (url)
"Check if URL is something sensible."
(let ((len (length url)))
(cond ((< len 5) nil)
((not (equal (substring url 0 5) "http:")) nil)
((> len 100) nil)
(t t))))
(cond ((> len 100) nil)
((and (>= len 5)
(equal (substring url 0 5) "http:") t))
((and (>= len 6)
(equal (substring url 0 6) "https:") t))
(t nil))))
(defun mh-x-image-display (image marker)
"Display IMAGE at MARKER."

View file

@ -0,0 +1,35 @@
;;; mh-xface-tests.el --- tests for mh-xface.el -*- lexical-binding: t -*-
;; Copyright (C) 2021 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
;;; Code:
(require 'ert)
(require 'mh-xface)
(ert-deftest mh-x-image-url-sane-p ()
"Test that `mh-x-image-url-sane-p' accepts a URL exactly if it is sane."
(should (equal (mh-x-image-url-sane-p (concat "http://"
(make-string 101 ?a)))
nil)) ;too long
(should (equal (mh-x-image-url-sane-p "http") nil)) ;too short
(should (equal (mh-x-image-url-sane-p "http:") t))
(should (equal (mh-x-image-url-sane-p "https") nil)) ;too short
(should (equal (mh-x-image-url-sane-p "https:") t))
(should (equal (mh-x-image-url-sane-p "https://www.example.com/me.png") t))
(should (equal (mh-x-image-url-sane-p "abcde:") nil)))