From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 03DE16DE00EF for ; Fri, 7 Sep 2018 04:29:32 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0.407 X-Spam-Level: X-Spam-Status: No, score=0.407 tagged_above=-999 required=5 tests=[AWL=-0.246, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_NEUTRAL=0.652, UNPARSEABLE_RELAY=0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RH4uTqTifWZN for ; Fri, 7 Sep 2018 04:29:31 -0700 (PDT) Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by arlo.cworth.org (Postfix) with ESMTPS id 8AEA06DE00E6 for ; Fri, 7 Sep 2018 04:29:27 -0700 (PDT) Received: by mail-wm0-f54.google.com with SMTP id j192-v6so14366871wmj.1 for ; Fri, 07 Sep 2018 04:29:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dme-org.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=N7YQeXD5Sa1mdgxGl+0Sr5r5u7AQOhxG9On6572caw4=; b=LOkt8uxu9UGDSeGG1d/ytlhDli0HKq7zHBm6UkTc4sPSpnZZHHzSMOWzs6Bo0WhA2I TzJdThe3qKHcBr47tRtsOkfq/RcRNouosxogZTbnhrO/a7r960bBOwMip3+SSK7zgXFB 14ddoCwh0QgXNItcVJ5XrRDNBSIIrOdAiHplglFfxy/Lwky8z+9d8Onk2eyxwIgcNExs CCwsTVYgqQcrJz1+9/JNWRS6cNOo4v/8wk4glqkIQnNz+/sQpIpkxmJMmTaKT0xSbtb+ 5MROt8VTlSMPwFwlFegA72DpCZbP30oNVAgzyx5XPZ1PGftf8slQy6L1pEYvpCVvrW1M GIzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=N7YQeXD5Sa1mdgxGl+0Sr5r5u7AQOhxG9On6572caw4=; b=VVrCP2WtbkE7vgkl2ZgkIuobVuvzuiAoTvT/qZrjWiihwrs7iUYY98yvskkCoCstxS 4j80QbPN0yK+/NVl/pNJ9xDIObs5NhUbSaeCGp7mMObKOhh4VL3VnaELkivz99KkrilC 4CdmW8hxcZ5LtnYpC9976WiI0ftZeIG2JPkkellbgHustfoZMNnzT+5jeOpddtzx3rTE P10tSiWeyOE52UIfTS27BIyZqeQRQd8MAP+WT0a6liU0n5ISycy0QHI3sf+wOvnI0DCw 1rWlHdqOMaLsYGJ2bMRS+jbOFNccuktNqgBAzdFF+9PFwK6sgqxLqpRoDNQv/zS50YLs V0qg== X-Gm-Message-State: APzg51DAQJ5eftAbZ11knmeByZSJxxf7j6G9tvAksZvcZlZSDAj9p+0M RrlQW/OWm11sEFtcRZoaRAla84YVB28= X-Google-Smtp-Source: ANB0VdbceJpyF5ItMNsjzu8EdOEN+WpaZ4TW7jMMWFOd160rCDwf4ZUGE2ZQyXR3JxaD4V6ksDPljQ== X-Received: by 2002:a1c:ac1:: with SMTP id 184-v6mr4829441wmk.119.1536319765053; Fri, 07 Sep 2018 04:29:25 -0700 (PDT) Received: from disaster-area.hh.sledj.net (disaster-area.hh.sledj.net. [81.149.164.25]) by smtp.gmail.com with ESMTPSA id h73-v6sm20236946wma.11.2018.09.07.04.29.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Sep 2018 04:29:23 -0700 (PDT) Received: from localhost (disaster-area.hh.sledj.net [local]) by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 6f2b34ea for ; Fri, 7 Sep 2018 11:29:21 +0000 (UTC) From: David Edmondson To: notmuch@notmuchmail.org Subject: [PATCH v2 2/4] emacs: Minor refactoring of crypto code Date: Fri, 7 Sep 2018 12:29:18 +0100 Message-Id: <20180907112920.3130-3-dme@dme.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180907112920.3130-1-dme@dme.org> References: <20180907112920.3130-1-dme@dme.org> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Sep 2018 11:29:32 -0000 --- emacs/notmuch-crypto.el | 96 +++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 46 deletions(-) diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el index ddb447a6..81c0eca0 100644 --- a/emacs/notmuch-crypto.el +++ b/emacs/notmuch-crypto.el @@ -96,36 +96,40 @@ mode." :supertype 'notmuch-button-type) (defun notmuch-crypto-insert-sigstatus-button (sigstatus from) + "Insert a button describing the signature status SIGSTATUS sent +by user FROM." (let* ((status (plist-get sigstatus :status)) - (help-msg nil) - (label "Signature not processed") (face 'notmuch-crypto-signature-unknown) - (button-action (lambda (button) (message (button-get button 'help-echo))))) + (button-action (lambda (button) (message (button-get button 'help-echo)))) + (keyid (concat "0x" (plist-get sigstatus :keyid))) + label help-msg) (cond ((string= status "good") - (let ((fingerprint (concat "0x" (plist-get sigstatus :fingerprint)))) - ;; if userid present, userid has full or greater validity - (if (plist-member sigstatus :userid) - (let ((userid (plist-get sigstatus :userid))) - (setq label (concat "Good signature by: " userid)) - (setq face 'notmuch-crypto-signature-good)) - (progn - (setq label (concat "Good signature by key: " fingerprint)) - (setq face 'notmuch-crypto-signature-good-key))) - (setq button-action 'notmuch-crypto-sigstatus-good-callback) - (setq help-msg (concat "Click to list key ID 0x" fingerprint ".")))) + (let ((fingerprint (concat "0x" (plist-get sigstatus :fingerprint))) + (userid (plist-get sigstatus :userid))) + ;; If userid is present it has full or greater validity. + (if userid + (setq label (concat "Good signature by: " userid) + face 'notmuch-crypto-signature-good) + (setq label (concat "Good signature by key: " fingerprint) + face 'notmuch-crypto-signature-good-key)) + (setq button-action 'notmuch-crypto-sigstatus-good-callback + help-msg (concat "Click to list key ID 0x" fingerprint ".")))) + ((string= status "error") - (let ((keyid (concat "0x" (plist-get sigstatus :keyid)))) - (setq label (concat "Unknown key ID " keyid " or unsupported algorithm")) - (setq button-action 'notmuch-crypto-sigstatus-error-callback) - (setq help-msg (concat "Click to retrieve key ID " keyid " from keyserver and redisplay.")))) + (setq label (concat "Unknown key ID " keyid " or unsupported algorithm") + button-action 'notmuch-crypto-sigstatus-error-callback + help-msg (concat "Click to retrieve key ID " keyid + " from keyserver and redisplay."))) + ((string= status "bad") - (let ((keyid (concat "0x" (plist-get sigstatus :keyid)))) - (setq label (concat "Bad signature (claimed key ID " keyid ")")) - (setq face 'notmuch-crypto-signature-bad))) + (setq label (concat "Bad signature (claimed key ID " keyid ")") + face 'notmuch-crypto-signature-bad)) + (t (setq label (concat "Unknown signature status" (if status (concat ": " status)))))) + (insert-button (concat "[ " label " ]") :type 'notmuch-crypto-status-button-type @@ -134,22 +138,22 @@ mode." 'mouse-face face 'action button-action :notmuch-sigstatus sigstatus - :notmuch-from from) - (insert "\n"))) - -(declare-function notmuch-show-refresh-view "notmuch-show" (&optional reset-state)) + :notmuch-from from)) + (insert "\n")) (defun notmuch-crypto-sigstatus-good-callback (button) (let* ((sigstatus (button-get button :notmuch-sigstatus)) (fingerprint (concat "0x" (plist-get sigstatus :fingerprint))) (buffer (get-buffer-create "*notmuch-crypto-gpg-out*")) - (window (display-buffer buffer t nil))) + (window (display-buffer buffer))) (with-selected-window window (with-current-buffer buffer (goto-char (point-max)) (call-process epg-gpg-program nil t t "--list-keys" fingerprint)) (recenter -1)))) +(declare-function notmuch-show-refresh-view "notmuch-show" (&optional reset-state)) + (defun notmuch-crypto--async-key-sentinel (process event) "When the user asks for a GPG key to be retrieved asynchronously, handle completion of that task." @@ -187,6 +191,8 @@ asynchronously, handle completion of that task." (insert label)))) (defun notmuch-crypto-sigstatus-error-callback (button) + "When signature validation has failed, try to retrieve the +corresponding key when the status button is pressed." (let* ((sigstatus (button-get button :notmuch-sigstatus)) (keyid (concat "0x" (plist-get sigstatus :keyid))) (buffer (get-buffer-create "*notmuch-crypto-gpg-out*"))) @@ -208,7 +214,7 @@ asynchronously, handle completion of that task." (process-put p :notmuch-show-point (point)) (message "Getting the GPG key %s asynchronously..." keyid) (continue-process p))) - (let ((window (display-buffer buffer t nil))) + (let ((window (display-buffer buffer))) (with-selected-window window (with-current-buffer buffer (goto-char (point-max)) @@ -219,25 +225,23 @@ asynchronously, handle completion of that task." (notmuch-show-refresh-view))))) (defun notmuch-crypto-insert-encstatus-button (encstatus) - (let* ((status (plist-get encstatus :status)) - (help-msg nil) - (label "Decryption not attempted") - (face 'notmuch-crypto-decryption)) - (cond - ((string= status "good") - (setq label "Decryption successful")) - ((string= status "bad") - (setq label "Decryption error")) - (t - (setq label (concat "Unknown encryption status" - (if status (concat ": " status)))))) - (insert-button - (concat "[ " label " ]") - :type 'notmuch-crypto-status-button-type - 'help-echo help-msg - 'face face - 'mouse-face face) - (insert "\n"))) + "Insert a button describing the encryption status ENCSTATUS." + (insert-button + (concat "[ " + (let ((status (plist-get encstatus :status))) + (cond + ((string= status "good") + "Decryption successful") + ((string= status "bad") + "Decryption error") + (t + (concat "Unknown encryption status" + (if status (concat ": " status)))))) + " ]") + :type 'notmuch-crypto-status-button-type + 'face 'notmuch-crypto-decryption + 'mouse-face 'notmuch-crypto-decryption) + (insert "\n")) ;; -- 2.11.0