X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa.el;h=cdd14fbf661609a7917c2ade9201a0c6513e61e0;hb=f60e21560324db2d229d2297ae79ec39b8d818b3;hp=28629b2a784357fe3593db2c46749cee789c2324;hpb=31cb916d71d15fff73ca59e75103106cf8d3299f;p=elisp%2Fepg.git

diff --git a/epa.el b/epa.el
index 28629b2..cdd14fb 100644
--- a/epa.el
+++ b/epa.el
@@ -1,4 +1,4 @@
-;;; epa.el --- EasyPG Assistant, GUI of EasyPG
+;;; epa.el --- the EasyPG Assistant
 ;; Copyright (C) 2006 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
@@ -29,7 +29,7 @@
 (eval-when-compile (require 'wid-edit))
 
 (defgroup epa nil
-  "EasyPG Assistant, GUI of EasyPG."
+  "The EasyPG Assistant"
   :group 'epg)
 
 (defgroup epa-faces nil
@@ -81,6 +81,15 @@
   :group 'epa-faces)
 (defvar epa-string-face 'epa-string-face)
 
+(defface epa-mark-face
+  '((((class color) (background dark))
+     (:foreground "orange" :bold t))
+    (t
+     (:foreground "red" :bold t)))
+  "Face used for displaying the high validity."
+  :group 'epa-faces)
+(defvar epa-mark-face 'epa-mark-face)
+
 (defface epa-field-name-face
   '((((class color) (background dark))
      (:foreground "PaleTurquoise" :bold t))
@@ -98,25 +107,24 @@
 (defvar epa-field-body-face 'epa-field-body-face)
 
 (defcustom epa-validity-face-alist
-  '((?o . epa-validity-disabled-face)
-    (?i . epa-validity-disabled-face)
-    (?d . epa-validity-disabled-face)
-    (?r . epa-validity-disabled-face)
-    (?e . epa-validity-disabled-face)
-    (?- . epa-validity-low-face)
-    (?q . epa-validity-low-face)
-    (?n . epa-validity-low-face)
-    (?m . epa-validity-medium-face)
-    (?f . epa-validity-high-face)
-    (?u . epa-validity-high-face))
-  "An alist mapping marks on epa-keys-buffer to faces."
+  '((unknown . epa-validity-disabled-face)
+    (invalid . epa-validity-disabled-face)
+    (disabled . epa-validity-disabled-face)
+    (revoked . epa-validity-disabled-face)
+    (expired . epa-validity-disabled-face)
+    (none . epa-validity-low-face)
+    (undefined . epa-validity-low-face)
+    (never . epa-validity-low-face)
+    (marginal . epa-validity-medium-face)
+    (full . epa-validity-high-face)
+    (ultimate . epa-validity-high-face))
+  "An alist mapping validity values to faces."
   :type 'list
   :group 'epa)
 
 (defcustom epa-font-lock-keywords
-  '(("^[* ]\\(\\([oidreqnmfu-]\\) .*\\)"
-     (1 (cdr (assq (aref (match-string 2) 0)
-		   epa-validity-face-alist))))
+  '(("^\\*"
+     (0 epa-mark-face))
     ("^\t\\([^\t:]+:\\)[ \t]*\\(.*\\)$"
      (1 epa-field-name-face)
      (2 epa-field-body-face)))
@@ -135,6 +143,7 @@
 (defvar epa-keys-buffer nil)
 (defvar epa-key-buffer-alist nil)
 (defvar epa-key nil)
+(defvar epa-list-keys-arguments nil)
 
 (defvar epa-keys-mode-map
   (let ((keymap (make-sparse-keymap)))
@@ -143,14 +152,59 @@
     (define-key keymap "d" 'epa-decrypt-file)
     (define-key keymap "v" 'epa-verify-file)
     (define-key keymap "s" 'epa-sign-file)
+    (define-key keymap "S" 'epa-sign-keys)
     (define-key keymap "e" 'epa-encrypt-file)
+    (define-key keymap "r" 'epa-delete-keys)
+    (define-key keymap "i" 'epa-import-keys)
+    (define-key keymap "o" 'epa-export-keys)
+    (define-key keymap "g" 'epa-list-keys)
     (define-key keymap "n" 'next-line)
     (define-key keymap "p" 'previous-line)
     (define-key keymap " " 'scroll-up)
     (define-key keymap [delete] 'scroll-down)
-    (define-key keymap "q" 'bury-buffer)
+    (define-key keymap "q" 'epa-exit-buffer)
     keymap))
 
+(defvar epa-exit-buffer-function #'bury-buffer)
+
+(define-widget 'epa-key 'push-button
+  "Button for representing a epg-key object."
+  :format "%[%v%]"
+  :button-face-get 'epa-key-widget-button-face-get
+  :value-create 'epa-key-widget-value-create
+  :action 'epa-key-widget-action
+  :help-echo 'epa-key-widget-help-echo)
+
+(defun epa-key-widget-action (widget &optional event)
+  (epa-show-key (widget-get widget :value)))
+
+(defun epa-key-widget-value-create (widget)
+  (let* ((key (widget-get widget :value))
+	 (primary-sub-key (car (epg-key-sub-key-list key)))
+	 (primary-user-id (car (epg-key-user-id-list key))))
+    (insert (format "%c "
+		    (if (epg-sub-key-validity primary-sub-key)
+			(car (rassq (epg-sub-key-validity primary-sub-key)
+				    epg-key-validity-alist))
+		      ? ))
+	    (epg-sub-key-id primary-sub-key)
+	    " "
+	    (if (stringp (epg-user-id-name primary-user-id))
+		(epg-user-id-name primary-user-id)
+	      (epg-decode-dn (epg-user-id-name primary-user-id))))))
+
+(defun epa-key-widget-button-face-get (widget)
+  (let ((validity (epg-sub-key-validity (car (epg-key-sub-key-list
+					      (widget-get widget :value))))))
+    (if validity
+	(cdr (assq validity epa-validity-face-alist))
+      'default)))
+
+(defun epa-key-widget-help-echo (widget)
+  (format "Show %s"
+	  (epg-sub-key-id (car (epg-key-sub-key-list
+				(widget-get widget :value))))))
+
 (defun epa-keys-mode ()
   "Major mode for `epa-list-keys'."
   (kill-all-local-variables)
@@ -188,46 +242,77 @@
   ;; In XEmacs, auto-initialization of font-lock is not effective
   ;; if buffer-file-name is not set.
   (font-lock-set-defaults)
+  (make-local-variable 'epa-exit-buffer-function)
   (run-hooks 'epa-key-mode-hook))
 
 ;;;###autoload
-(defun epa-list-keys (&optional name)
-  (interactive "sPattern: ")
+(defun epa-list-keys (&optional name mode protocol)
+  (interactive
+   (if current-prefix-arg
+       (let ((name (read-string "Pattern: "
+				(if epa-list-keys-arguments
+				    (car epa-list-keys-arguments)))))
+	 (list (if (equal name "") nil name)
+	       (y-or-n-p "Secret keys? ")
+	       (intern (completing-read "Protocol? "
+					'(("OpenPGP") ("CMS"))
+					nil t))))
+     (or epa-list-keys-arguments (list nil nil nil))))
   (unless (and epa-keys-buffer
 	       (buffer-live-p epa-keys-buffer))
     (setq epa-keys-buffer (generate-new-buffer "*Keys*")))
   (set-buffer epa-keys-buffer)
-  (erase-buffer)
-  (epa-list-keys-1 name)
-  (epa-keys-mode)
+  (let ((inhibit-read-only t)
+	buffer-read-only
+	(point (point-min))
+	(context (epg-make-context protocol)))
+    (unless (get-text-property point 'epa-list-keys)
+      (setq point (next-single-property-change point 'epa-list-keys)))
+    (when point
+      (delete-region point
+		     (or (next-single-property-change point 'epa-list-keys)
+			 (point-max)))
+      (goto-char point))
+    (epa-list-keys-1 context name mode)
+    (epa-keys-mode))
+  (make-local-variable 'epa-list-keys-arguments)
+  (setq epa-list-keys-arguments (list name mode protocol))
   (goto-char (point-min))
   (pop-to-buffer (current-buffer)))
 
-(defun epa-list-keys-1 (name)
-  (let ((inhibit-read-only t)
-	buffer-read-only
-	keys point primary-sub-key primary-user-id)
-    (setq keys (epg-list-keys name))
-    (while keys
-      (setq point (point)
-	    primary-sub-key (car (epg-key-sub-key-list (car keys)))
-	    primary-user-id (car (epg-key-user-id-list (car keys))))
-      (insert " " (or (char-to-string
-		       (car (rassq (epg-sub-key-validity primary-sub-key)
-				   epg-key-validity-alist)))
-		      " ") " ")
-      (widget-create 'link 
-		     :tag (epg-sub-key-id primary-sub-key)
-		     :notify 'epa-show-key-notify
-		     :help-echo
-		     (format "Show key %s"
-			     (epg-sub-key-id primary-sub-key))
-		     (car keys))
-      (insert " " (epg-user-id-name primary-user-id) "\n")
-      (put-text-property point (point) 'epa-key (car keys))
-      (setq keys (cdr keys)))))
-
-(defun epa-select-keys (prompt &optional names)
+(defun epa-list-keys-1 (context name mode)
+  (save-restriction
+    (narrow-to-region (point) (point))
+    (let ((inhibit-read-only t)
+	  buffer-read-only
+	  (keys (epg-list-keys context name mode))
+	  point)
+      (while keys
+	(setq point (point))
+	(insert "  ")
+	(put-text-property point (point) 'epa-key (car keys))
+	(widget-create 'epa-key :value (car keys))
+	(insert "\n")
+	(setq keys (cdr keys))))      
+    (put-text-property (point-min) (point-max) 'epa-list-keys t)))
+
+(defun epa-marked-keys ()
+  (or (save-excursion
+	(set-buffer epa-keys-buffer)
+	(goto-char (point-min))
+	(let (keys key)
+	  (while (re-search-forward "^\\*" nil t)
+	    (if (setq key (get-text-property (match-beginning 0)
+					     'epa-key))
+		(setq keys (cons key keys))))
+	  (nreverse keys)))
+      (save-excursion
+	(beginning-of-line)
+	(let ((key (get-text-property (point) 'epa-key)))
+	  (if key
+	      (list key))))))
+
+(defun epa-select-keys (context prompt &optional names mode)
   (save-excursion
     (unless (and epa-keys-buffer
 		 (buffer-live-p epa-keys-buffer))
@@ -239,6 +324,12 @@
       (erase-buffer)
       (insert prompt "\n")
       (widget-create 'link
+		     :notify (lambda (&rest ignore) (abort-recursive-edit))
+		     :help-echo
+		     (substitute-command-keys
+		      "Click here or \\[abort-recursive-edit] to cancel")
+		     "Cancel")
+      (widget-create 'link
 		     :notify (lambda (&rest ignore) (exit-recursive-edit))
 		     :help-echo
 		     (substitute-command-keys
@@ -248,26 +339,20 @@
       (if names
 	  (while names
 	    (setq point (point))
-	    (epa-list-keys-1 (car names))
+	    (epa-list-keys-1 context (car names) mode)
 	    (goto-char point)
 	    (epa-mark)
 	    (goto-char (point-max))
 	    (setq names (cdr names)))
-	(epa-list-keys-1 nil))
+	(epa-list-keys-1 context nil mode))
       (epa-keys-mode)
+      (setq epa-exit-buffer-function #'abort-recursive-edit)
       (goto-char (point-min))
       (pop-to-buffer (current-buffer))
       (unwind-protect
 	  (progn
 	    (recursive-edit)
-	    (save-excursion
-	      (set-buffer epa-keys-buffer)
-	      (goto-char (point-min))
-	      (let (keys key)
-		(while (re-search-forward "^\\*" nil t)
-		  (if (setq key (get-text-property (match-beginning 0) 'epa-key))
-		      (setq keys (cons key keys))))
-		(nreverse keys))))
+	    (epa-marked-keys))
 	(if (get-buffer-window epa-keys-buffer)
 	    (delete-window (get-buffer-window epa-keys-buffer)))
 	(kill-buffer epa-keys-buffer)))))
@@ -293,19 +378,25 @@
     (setq pointer (epg-key-user-id-list key))
     (while pointer
       (insert " "
-	      (char-to-string
-	       (car (rassq (epg-user-id-validity (car pointer))
-			   epg-key-validity-alist)))
+	      (if (epg-user-id-validity (car pointer))
+		  (char-to-string
+		   (car (rassq (epg-user-id-validity (car pointer))
+			       epg-key-validity-alist)))
+		" ")
 	      " "
-	      (epg-user-id-name (car pointer))
+	      (if (stringp (epg-user-id-name (car pointer)))
+		  (epg-user-id-name (car pointer))
+		(epg-decode-dn (epg-user-id-name (car pointer))))
 	      "\n")
       (setq pointer (cdr pointer)))
     (setq pointer (epg-key-sub-key-list key))
     (while pointer
       (insert " "
-	      (char-to-string
-	       (car (rassq (epg-sub-key-validity (car pointer))
-			   epg-key-validity-alist)))
+	      (if (epg-sub-key-validity (car pointer))
+		  (char-to-string
+		   (car (rassq (epg-sub-key-validity (car pointer))
+			       epg-key-validity-alist)))
+		" ")
 	      " "
 	      (epg-sub-key-id (car pointer))
 	      " "
@@ -318,7 +409,7 @@
 	      (epg-sub-key-creation-time (car pointer))
 	      (if (epg-sub-key-expiration-time (car pointer))
 		  (format "\n\tExpires: %s" (epg-sub-key-expiration-time
-						  (car pointer)))
+					     (car pointer)))
 		"")
 	      "\n\tCapabilities: "
 	      (mapconcat #'symbol-name
@@ -333,7 +424,7 @@
     (epa-key-mode)))
 
 (defun epa-show-key-notify (widget &rest ignore)
-  (epa-show-key (widget-value widget)))
+  (epa-show-key (widget-get widget :value)))
 
 (defun epa-mark (&optional arg)
   "Mark the current line."
@@ -353,15 +444,20 @@
   (interactive "P")
   (epa-mark (not arg)))
 
+(defun epa-exit-buffer ()
+  (interactive)
+  (funcall epa-exit-buffer-function))
+
 (defun epa-decrypt-file (file)
   (interactive "fFile: ")
   (let* ((default-name (file-name-sans-extension file))
-	 (plain (read-file-name
-		 (concat "To file (default "
-			 (file-name-nondirectory default-name)
-			 ") ")
-		 (file-name-directory default-name)
-		 default-name))
+	 (plain (expand-file-name
+		 (read-file-name
+		  (concat "To file (default "
+			  (file-name-nondirectory default-name)
+			  ") ")
+		  (file-name-directory default-name)
+		  default-name)))
 	 (context (epg-make-context)))
     (message "Decrypting %s..." (file-name-nondirectory file))
     (epg-decrypt-file context file plain)
@@ -374,35 +470,87 @@
 		    (file-name-sans-extension file))))
     (message "Verifying %s..." (file-name-nondirectory file))
     (epg-verify-file context file plain)
-    (message "Verifying %s...done" (file-name-nondirectory file))))
+    (message "Verifying %s...done" (file-name-nondirectory file))
+    (message "%s"
+	     (epg-verify-result-to-string
+	      (epg-context-result-for context 'verify)))))
 
 (defun epa-sign-file (file detached)
   (interactive
    (list (expand-file-name (read-file-name "File: "))
-	 current-prefix-arg))
+	 (y-or-n-p "Make a detached signature? ")))
   (let ((signature (concat file (if detached ".sig" ".gpg")))
 	(context (epg-make-context)))
     (message "Signing %s..." (file-name-nondirectory file))
-    (epg-sign-file context file signature)
+    (epg-sign-file context file signature (not (null detached)))
     (message "Signing %s...done" (file-name-nondirectory file))))
 
 (defun epa-encrypt-file (file recipients)
   (interactive
    (list (expand-file-name (read-file-name "File: "))
-	 (mapcar (lambda (key)
-		 (epg-sub-key-id
-		  (car (epg-key-sub-key-list key))))
-		 (epa-select-keys "Select recipents for encryption.
-If no one is selected, symmetric encryption will be performed.  "))))
+	 (epa-select-keys (epg-make-context) "Select recipents for encryption.
+If no one is selected, symmetric encryption will be performed.  ")))
   (let ((cipher (concat file ".gpg"))
 	(context (epg-make-context)))
     (message "Encrypting %s..." (file-name-nondirectory file))
-    (epg-encrypt-file context
-		      file
-		      recipients
-		      cipher)
+    (epg-encrypt-file context file recipients cipher)
     (message "Encrypting %s...done" (file-name-nondirectory file))))
 
+(defun epa-delete-keys (keys)
+  (interactive
+   (let ((keys (epa-marked-keys)))
+     (unless keys
+       (error "No keys selected"))
+     (list keys)))
+  (let ((context (epg-make-context)))
+    (message "Deleting...")
+    (epg-delete-keys context keys)
+    (apply #'epa-list-keys epa-list-keys-arguments)
+    (message "Deleting...done")))
+
+(defun epa-import-keys (file)
+  (interactive "fFile: ")
+  (let ((context (epg-make-context)))
+    (message "Importing %s..." (file-name-nondirectory file))
+    (epg-import-keys-from-file context (expand-file-name file))
+    (apply #'epa-list-keys epa-list-keys-arguments)
+    (message "Importing %s...done" (file-name-nondirectory file))))
+
+(defun epa-export-keys (keys file)
+  (interactive
+   (let ((keys (epa-marked-keys))
+	 default-name)
+     (unless keys
+       (error "No keys selected"))
+     (setq default-name
+	   (expand-file-name
+	    (concat (epg-sub-key-id (car (epg-key-sub-key-list (car keys))))
+		    ".gpg")
+	    default-directory))
+     (list keys
+	   (expand-file-name
+	    (read-file-name
+	     (concat "To file (default "
+		     (file-name-nondirectory default-name)
+		     ") ")
+	     (file-name-directory default-name)
+	     default-name)))))
+  (let ((context (epg-make-context)))
+    (message "Exporting to %s..." (file-name-nondirectory file))
+    (epg-export-keys-to-file context keys file)
+    (message "Exporting to %s...done" (file-name-nondirectory file))))
+
+(defun epa-sign-keys (keys &optional local)
+  (interactive
+   (let ((keys (epa-marked-keys)))
+     (unless keys
+       (error "No keys selected"))
+     (list keys current-prefix-arg)))
+  (let ((context (epg-make-context)))
+    (message "Signing keys...")
+    (epg-sign-keys context keys local)
+    (message "Signing keys...done")))
+
 (provide 'epa)
 
 ;;; epa.el ends here