mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-22 10:58:10 +01:00
2e351d10c2
The documentation for message mode clearly states that EasyPG (which uses GnuPG) is the default and recommended way to use S/MIME with mml-secure: [0] https://www.gnu.org/software/emacs/manual/html_node/message/Using-S_002fMIME.html To ensure that this mode works, we just need to import the secret key in question into gpgsm in addition to the public key. gpgsm should be able pick the right keys+certificates to use based on To/From headers, so we don't have to specify anything manually in the #secure mml tag. The import process from the OpenSSL-preferred form (cert+secretkey) is rather ugly, because gpgsm wants to see a PKCS#12 object when importing secret keys. Note that EasyPG generates the more modern Content-Type: application/pkcs7-signature instead of application/x-pkcs7-signature for the detached signature. We are also obliged to manually set gpgsm's include-certs setting to 1 because gpgsm defaults to send "everything but the root cert". In our weird test case, the certificate we're using is self-signed, so it *is* the root cert, which means that gpgsm doesn't include it by default. Setting it to 1 forces inclusion of the signer's cert, which satisfies openssl's smime subcommand. See https://dev.gnupg.org/T4878 for more details. Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
195 lines
6.5 KiB
EmacsLisp
195 lines
6.5 KiB
EmacsLisp
;; test-lib.el --- auxiliary stuff for Notmuch Emacs tests.
|
|
;;
|
|
;; Copyright © Carl Worth
|
|
;; Copyright © David Edmondson
|
|
;;
|
|
;; This file is part of Notmuch test suit.
|
|
;;
|
|
;; Notmuch 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.
|
|
;;
|
|
;; Notmuch 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 Notmuch. If not, see <https://www.gnu.org/licenses/>.
|
|
;;
|
|
;; Authors: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
|
|
|
|
(require 'cl-lib)
|
|
|
|
;; `read-file-name' by default uses `completing-read' function to read
|
|
;; user input. It does not respect `standard-input' variable which we
|
|
;; use in tests to provide user input. So replace it with a plain
|
|
;; `read' call.
|
|
(setq read-file-name-function (lambda (&rest _) (read)))
|
|
|
|
;; Work around a bug in emacs 23.1 and emacs 23.2 which prevents
|
|
;; noninteractive (kill-emacs) from emacsclient.
|
|
(if (and (= emacs-major-version 23) (< emacs-minor-version 3))
|
|
(defadvice kill-emacs (before disable-yes-or-no-p activate)
|
|
"Disable yes-or-no-p before executing kill-emacs"
|
|
(defun yes-or-no-p (prompt) t)))
|
|
|
|
;; Emacs bug #2930:
|
|
;; 23.0.92; `accept-process-output' and `sleep-for' do not run sentinels
|
|
;; seems to be present in Emacs 23.1.
|
|
;; Running `list-processes' after `accept-process-output' seems to work
|
|
;; around this problem.
|
|
(if (and (= emacs-major-version 23) (= emacs-minor-version 1))
|
|
(defadvice accept-process-output (after run-list-processes activate)
|
|
"run list-processes after executing accept-process-output"
|
|
(list-processes)))
|
|
|
|
(defun notmuch-test-wait ()
|
|
"Wait for process completion."
|
|
(while (get-buffer-process (current-buffer))
|
|
(accept-process-output nil 0.1)))
|
|
|
|
(defun test-output (&optional filename)
|
|
"Save current buffer to file FILENAME. Default FILENAME is OUTPUT."
|
|
(notmuch-post-command)
|
|
(write-region (point-min) (point-max) (or filename "OUTPUT")))
|
|
|
|
(defun test-visible-output (&optional filename)
|
|
"Save visible text in current buffer to file FILENAME. Default
|
|
FILENAME is OUTPUT."
|
|
(notmuch-post-command)
|
|
(let ((text (visible-buffer-string))
|
|
;; Tests expect output in UTF-8 encoding
|
|
(coding-system-for-write 'utf-8))
|
|
(with-temp-file (or filename "OUTPUT") (insert text))))
|
|
|
|
(defun visible-buffer-string ()
|
|
"Same as `buffer-string', but excludes invisible text and
|
|
removes any text properties."
|
|
(visible-buffer-substring (point-min) (point-max)))
|
|
|
|
(defun visible-buffer-substring (start end)
|
|
"Same as `buffer-substring-no-properties', but excludes
|
|
invisible text."
|
|
(let (str)
|
|
(while (< start end)
|
|
(let ((next-pos (next-char-property-change start end)))
|
|
(when (not (invisible-p start))
|
|
(setq str (concat str (buffer-substring-no-properties
|
|
start next-pos))))
|
|
(setq start next-pos)))
|
|
str))
|
|
|
|
;; process-attributes is not defined everywhere, so define an
|
|
;; alternate way to test if a process still exists.
|
|
|
|
(defun test-process-running (pid)
|
|
(= 0
|
|
(signal-process pid 0)))
|
|
|
|
(defun orphan-watchdog-check (pid)
|
|
"Periodically check that the process with id PID is still
|
|
running, quit if it terminated."
|
|
(if (not (test-process-running pid))
|
|
(kill-emacs)))
|
|
|
|
(defun orphan-watchdog (pid)
|
|
"Initiate orphan watchdog check."
|
|
(run-at-time 60 60 'orphan-watchdog-check pid))
|
|
|
|
(defun hook-counter (hook)
|
|
"Count how many times a hook is called. Increments
|
|
`hook'-counter variable value if it is bound, otherwise does
|
|
nothing."
|
|
(let ((counter (intern (concat (symbol-name hook) "-counter"))))
|
|
(if (boundp counter)
|
|
(set counter (1+ (symbol-value counter))))))
|
|
|
|
(defun add-hook-counter (hook)
|
|
"Add hook to count how many times `hook' is called."
|
|
(add-hook hook (apply-partially 'hook-counter hook)))
|
|
|
|
(add-hook-counter 'notmuch-hello-mode-hook)
|
|
(add-hook-counter 'notmuch-hello-refresh-hook)
|
|
|
|
(defadvice notmuch-search-process-filter (around pessimal activate disable)
|
|
"Feed notmuch-search-process-filter one character at a time."
|
|
(let ((string (ad-get-arg 1)))
|
|
(cl-loop for char across string
|
|
do (progn
|
|
(ad-set-arg 1 (char-to-string char))
|
|
ad-do-it))))
|
|
|
|
(defun notmuch-test-mark-links ()
|
|
"Enclose links in the current buffer with << and >>."
|
|
;; Links are often created by jit-lock functions
|
|
(jit-lock-fontify-now)
|
|
(save-excursion
|
|
(let ((inhibit-read-only t))
|
|
(goto-char (point-min))
|
|
(let ((button))
|
|
(while (setq button (next-button (point)))
|
|
(goto-char (button-start button))
|
|
(insert "<<")
|
|
(goto-char (button-end button))
|
|
(insert ">>"))))))
|
|
|
|
(defmacro notmuch-test-run (&rest body)
|
|
"Evaluate a BODY of test expressions and output the result."
|
|
`(with-temp-buffer
|
|
(let ((buffer (current-buffer))
|
|
(result (progn ,@body)))
|
|
(switch-to-buffer buffer)
|
|
(insert (if (stringp result)
|
|
result
|
|
(prin1-to-string result)))
|
|
(test-output))))
|
|
|
|
(defun notmuch-test-report-unexpected (output expected)
|
|
"Report that the OUTPUT does not match the EXPECTED result."
|
|
(concat "Expect:\t" (prin1-to-string expected) "\n"
|
|
"Output:\t" (prin1-to-string output) "\n"))
|
|
|
|
(defun notmuch-test-expect-equal (output expected)
|
|
"Compare OUTPUT with EXPECTED. Report any discrepencies."
|
|
(if (equal output expected)
|
|
t
|
|
(cond
|
|
((and (listp output)
|
|
(listp expected))
|
|
;; Reporting the difference between two lists is done by
|
|
;; reporting differing elements of OUTPUT and EXPECTED
|
|
;; pairwise. This is expected to make analysis of failures
|
|
;; simpler.
|
|
(apply #'concat (cl-loop for o in output
|
|
for e in expected
|
|
if (not (equal o e))
|
|
collect (notmuch-test-report-unexpected o e))))
|
|
|
|
(t
|
|
(notmuch-test-report-unexpected output expected)))))
|
|
|
|
(defun notmuch-post-command ()
|
|
(run-hooks 'post-command-hook))
|
|
|
|
(defmacro notmuch-test-progn (&rest body)
|
|
(cons 'progn
|
|
(mapcar
|
|
(lambda (x) `(prog1 ,x (notmuch-post-command)))
|
|
body)))
|
|
|
|
;; For historical reasons, we hide deleted tags by default in the test
|
|
;; suite
|
|
(setq notmuch-tag-deleted-formats
|
|
'((".*" nil)))
|
|
|
|
;; Also for historical reasons, we set the fcc handler to file not
|
|
;; insert.
|
|
|
|
(setq notmuch-maildir-use-notmuch-insert nil)
|
|
|
|
;; force a common html renderer, to avoid test variations between
|
|
;; environments
|
|
|
|
(setq mm-text-html-renderer 'html2text)
|