From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Daiki Ueno Newsgroups: gmane.emacs.devel,gmane.emacs.gnus.general Subject: Re: Small patch to enable use of gpg-agent with pgg Date: Thu, 23 Mar 2006 19:40:08 +0900 Message-ID: References: <2cd46e7f0510031250u66ea1349yb437d539ce4027ef@mail.gmail.com> <2cd46e7f0510061541w73bb6a92wb6d22829b6e804ae@mail.gmail.com> <20051007100014.GB4850@kenny.sha-bang.local> <2cd46e7f0510071106k3d4d3e6agc36f16a37d8b6bc6@mail.gmail.com> <20051007214952.GA30235@kenny.sha-bang.local> <20051008103627.GA1218@kenny.sha-bang.local> <2cd46e7f0510081131h14e2bbeaga7f1a33ebd6347c8@mail.gmail.com> <2cd46e7f0510101415t76825ea7u9749fe23da54ce@mail.gmail.com> <2cd46e7f0510121647x3c51fb65pc883ed61f4e864ab@mail.gmail.com> <2cd46e7f0510200708x4640d1c2t50743cf439e52dd4@mail.gmail.com> <87pskfq361.fsf@latte.josefsson.org> <877j6mg2af.fsf@latte.josefsson.org> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Multipart_Thu_Mar_23_19:40:08_2006-1" X-Trace: sea.gmane.org 1143110452 13382 80.91.229.2 (23 Mar 2006 10:40:52 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 23 Mar 2006 10:40:52 +0000 (UTC) Cc: Sascha Wilde , ding@gnus.org, emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 23 11:40:50 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FMNFI-0002W4-7m for ged-emacs-devel@m.gmane.org; Thu, 23 Mar 2006 11:40:49 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FMNFH-0001UA-PE for ged-emacs-devel@m.gmane.org; Thu, 23 Mar 2006 05:40:47 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1FMNEy-0001TS-Ok for emacs-devel@gnu.org; Thu, 23 Mar 2006 05:40:28 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1FMNEw-0001TG-LD for emacs-devel@gnu.org; Thu, 23 Mar 2006 05:40:28 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FMNEw-0001TD-FY for emacs-devel@gnu.org; Thu, 23 Mar 2006 05:40:26 -0500 Original-Received: from [210.231.96.69] (helo=well-done.deisui.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA:32) (Exim 4.52) id 1FMNFV-0007eM-2k for emacs-devel@gnu.org; Thu, 23 Mar 2006 05:41:02 -0500 Original-Received: from [150.82.173.221] (helo=well-done.deisui.org) by well-done.deisui.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1FMNEh-0007eQ-4c; Thu, 23 Mar 2006 19:40:11 +0900 Original-To: Simon Josefsson X-Attribution: DU In-Reply-To: (Daiki Ueno's message of "Wed, 22 Mar 2006 21:25:06 +0900") User-Agent: T-gnus/6.17.2 (based on No Gnus v0.2) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 MULE XEmacs/21.4 (patch 17) (Jumbo Shrimp) (i686-pc-linux) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:51993 gmane.emacs.gnus.general:62378 Archived-At: --Multipart_Thu_Mar_23_19:40:08_2006-1 Content-Type: text/plain; charset=US-ASCII Hello, >>>>> In >>>>> Daiki Ueno wrote: > > Right now, pgg assume that gpg will need a passphrase so it asks the > > user for one. It may be better if pgg postpone the passphrase query > > until gpg tell pgg that it needs a passphrase. Then it is only > > queried for when it is needed. This should be more reliable, but > > slightly more complicated to implement (asynchronous code). > Anyway, I'll try to implement this. Could you please try the attached pgg-gpg.el? Please note, this patch is only for review, not meant to be committed now. --Multipart_Thu_Mar_23_19:40:08_2006-1 Content-Type: application/octet-stream; type=emacs-lisp Content-Disposition: attachment; filename="pgg-gpg.el" Content-Transfer-Encoding: 7bit ;;; pgg-gpg.el --- GnuPG support for PGG. ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Daiki Ueno ;; Symmetric encryption and gpg-agent support added by: ;; Sascha Wilde ;; Created: 1999/10/28 ;; Keywords: PGP, OpenPGP, GnuPG ;; 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 2, 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; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. ;;; Code: (eval-when-compile (require 'pgg)) (defgroup pgg-gpg () "GnuPG interface." :group 'pgg) (defcustom pgg-gpg-program "gpg" "The GnuPG executable." :group 'pgg-gpg :type 'string) (defcustom pgg-gpg-extra-args nil "Extra arguments for every GnuPG invocation." :group 'pgg-gpg :type '(repeat (string :tag "Argument"))) (defcustom pgg-gpg-recipient-argument "--recipient" "GnuPG option to specify recipient." :group 'pgg-gpg :type '(choice (const :tag "New `--recipient' option" "--recipient") (const :tag "Old `--remote-user' option" "--remote-user"))) (defcustom pgg-gpg-use-agent nil "Whether to use gnupg agent for key caching." :group 'pgg-gpg :type 'boolean) (defcustom pgg-gpg-timeout 60 "Timeout of GnuPG command execution." :group 'pgg-gpg :type 'integer) (defvar pgg-gpg-user-id nil "GnuPG ID of your default identity.") (defvar pgg-gpg-user-id-alist nil "An alist mapping from key ID to user ID.") (defvar pgg-gpg-read-point nil) (defvar pgg-gpg-output-file-name nil) (defvar pgg-gpg-pending-status-list nil) (defvar pgg-gpg-key-id nil) (defvar pgg-gpg-debug-buffer " *pgg-gpg-debug*") (defun pgg-gpg-start-process (args) (let* ((output-file-name (pgg-make-temp-file "pgg-output")) (args (append (list "--no-tty" "--status-fd" "1" "--command-fd" "0" "--yes" ; overwrite "--output" output-file-name) (if pgg-gpg-use-agent '("--use-agent")) pgg-gpg-extra-args args)) (coding-system-for-write 'binary) (process-connection-type nil) (orig-mode (default-file-modes)) default-enable-multibyte-characters (buffer (if pgg-gpg-debug-buffer pgg-gpg-debug-buffer (generate-new-buffer " *pgg-gpg*"))) process) (if pgg-gpg-debug-buffer (save-excursion (set-buffer (get-buffer-create pgg-gpg-debug-buffer)) (erase-buffer))) (with-current-buffer buffer (make-local-variable 'pgg-gpg-read-point) (setq pgg-gpg-read-point (point-min)) (make-local-variable 'pgg-gpg-output-file-name) (setq pgg-gpg-output-file-name output-file-name) (make-local-variable 'pgg-gpg-pending-status-list) (setq pgg-gpg-pending-status-list nil) (make-local-variable 'pgg-gpg-key-id) (setq pgg-gpg-key-id nil)) (unwind-protect (progn (set-default-file-modes 448) (setq process (apply #'start-process "pgg-gpg" buffer pgg-gpg-program args)) (set-process-filter process #'pgg-gpg-process-filter) (set-process-sentinel process #'pgg-gpg-process-sentinel)) (set-default-file-modes orig-mode)) process)) (defun pgg-gpg-process-filter (process input) (save-excursion (set-buffer (process-buffer process)) (goto-char (point-max)) (insert input) (goto-char pgg-gpg-read-point) (beginning-of-line) (while (looking-at ".*\n") ;the input line is finished (save-excursion (if (looking-at "\\[GNUPG:] \\([A-Z_]+\\)\\>.*") (let* ((status (match-string 1)) (symbol (intern-soft (concat "pgg-gpg-handle-" status))) (entry (member status pgg-gpg-pending-status-list))) (if entry (setq pgg-gpg-pending-status-list (delq (car entry) pgg-gpg-pending-status-list))) (if (and symbol (fboundp symbol)) (funcall symbol process (buffer-substring (match-beginning 1) (match-end 0))))))) (forward-line)) (setq pgg-gpg-read-point (point)))) (defun pgg-gpg-process-sentinel (process status) (save-excursion ;; Copy the contents of process-buffer to pgg-errors-buffer. (set-buffer (get-buffer-create pgg-errors-buffer)) (buffer-disable-undo) (erase-buffer) (when (buffer-live-p (process-buffer process)) (insert-buffer-substring (process-buffer process)) (goto-char (point-min)) (delete-matching-lines "^\\[GNUPG:] ") (goto-char (point-min)) (while (re-search-forward "^gpg: " nil t) (replace-match ""))) ;; Read the contents of the output file to pgg-output-buffer. (set-buffer (get-buffer-create pgg-output-buffer)) (buffer-disable-undo) (erase-buffer) (if (and (equal status "finished\n") (buffer-live-p (process-buffer process))) (let ((output-file-name (with-current-buffer (process-buffer process) pgg-gpg-output-file-name))) (when (file-exists-p output-file-name) (let ((coding-system-for-read (if pgg-text-mode 'raw-text 'binary))) (insert-file-contents output-file-name)) (delete-file output-file-name)))) (if (buffer-live-p (process-buffer process)) (kill-buffer (process-buffer process))))) (defun pgg-gpg-wait-for-status (process status-list) (with-current-buffer (process-buffer process) (setq pgg-gpg-pending-status-list status-list) (while (and (eq (process-status process) 'run) pgg-gpg-pending-status-list) (accept-process-output process 1)))) (defun pgg-gpg-wait-for-process (process) (while (eq (process-status process) 'run) (accept-process-output process 1)) (sit-for 1)) (defun pgg-gpg-handle-USERID_HINT (process line) (if (string-match "^USERID_HINT \\([^ ]+\\) \\(.*\\)" line) (let* ((key-id (match-string 1 line)) (user-id (match-string 2 line)) (entry (assoc key-id pgg-gpg-user-id-alist))) (if entry (setcdr entry user-id) (setq pgg-gpg-user-id-alist (cons (cons key-id user-id) pgg-gpg-user-id-alist)))))) (defun pgg-gpg-handle-NEED_PASSPHRASE (process line) (if (string-match "^NEED_PASSPHRASE \\([^ ]+\\)" line) (setq pgg-gpg-key-id (match-string 1 line)))) (defun pgg-gpg-handle-NEED_PASSPHRASE_SYM (process line) (setq pgg-gpg-key-id 'symmetric)) (defun pgg-gpg-handle-GET_HIDDEN (process line) (let* ((entry (assoc pgg-gpg-key-id pgg-gpg-user-id-alist)) (passphrase (pgg-read-passphrase (if (eq pgg-gpg-key-id 'symmetric) "GnuPG passphrase for symmetric encryption: " (format "GnuPG passphrase for %s: " (if entry (cdr entry) pgg-gpg-key-id))) pgg-gpg-key-id))) (if passphrase (process-send-string process (concat passphrase "\n"))))) (defun pgg-gpg-lookup-key (string &optional type) "Search keys associated with STRING." (let ((args (list "--with-colons" "--no-greeting" "--batch" (if type "--list-secret-keys" "--list-keys") string))) (with-temp-buffer (apply #'call-process pgg-gpg-program nil t nil args) (goto-char (point-min)) (if (re-search-forward "^\\(sec\\|pub\\):[^:]*:[^:]*:[^:]*:\\([^:]*\\)" nil t) (substring (match-string 2) 8))))) (defun pgg-gpg-encrypt-region (start end recipients &optional sign passphrase) "Encrypt the current region between START and END. If optional argument SIGN is non-nil, do a combined sign and encrypt." (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id)) (args (append '("--armor" "--always-trust" "--encrypt") (if pgg-text-mode '("--textmode")) (if sign (list "--sign" "--local-user" pgg-gpg-user-id)) (if recipients (apply #'nconc (mapcar (lambda (rcpt) (list pgg-gpg-recipient-argument rcpt)) (append recipients (if pgg-encrypt-for-me (list pgg-gpg-user-id)))))))) (process (pgg-gpg-start-process args))) (if sign (pgg-gpg-wait-for-status process '("GOOD_PASSPHRASE"))) (process-send-region process start end) (process-send-eof process) (pgg-gpg-wait-for-process process) (pgg-process-when-success))) (defun pgg-gpg-encrypt-symmetric-region (start end &optional passphrase) "Encrypt the current region between START and END with symmetric cipher." (let* ((args (append '("--armor" "--symmetric") (if pgg-text-mode '("--textmode")))) (process (pgg-gpg-start-process args))) (pgg-gpg-wait-for-status process '("GOT_IT")) (process-send-region process start end) (process-send-eof process) (pgg-gpg-wait-for-process process) (pgg-process-when-success))) (defun pgg-gpg-decrypt-region (start end &optional passphrase) "Decrypt the current region between START and END." (let* ((args '("--decrypt")) (process (pgg-gpg-start-process args))) (process-send-region process start end) (pgg-gpg-wait-for-status process '("GOOD_PASSPHRASE")) (process-send-eof process) (pgg-gpg-wait-for-process process) (save-excursion (set-buffer pgg-errors-buffer) (goto-char (point-min)) (re-search-forward "^\\[GNUPG:] DECRYPTION_OKAY\\>" nil t)))) (defun pgg-gpg-sign-region (start end &optional cleartext passphrase) "Make detached signature from text between START and END." (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id)) (args (append (list (if cleartext "--clearsign" "--detach-sign") "--armor" "--verbose" "--local-user" pgg-gpg-user-id) (if pgg-text-mode '("--textmode")))) (process (pgg-gpg-start-process args))) (pgg-gpg-wait-for-status process '("GOOD_PASSPHRASE")) (process-send-region process start end) (process-send-eof process) (pgg-gpg-wait-for-process process) (pgg-process-when-success))) (defun pgg-gpg-verify-region (start end &optional signature) "Verify region between START and END as the detached signature SIGNATURE." (let ((args '("--verify")) process) (when (stringp signature) (setq args (append args (list signature)))) (setq process (pgg-gpg-start-process (append args '("-")))) (process-send-region process start end) (pgg-gpg-wait-for-process process) (with-current-buffer pgg-errors-buffer (goto-char (point-min)) (while (re-search-forward "^gpg: \\(.*\\)\n" nil t) (with-current-buffer pgg-output-buffer (insert-buffer-substring pgg-errors-buffer (match-beginning 1) (match-end 0))) (delete-region (match-beginning 0) (match-end 0))) (goto-char (point-min)) (re-search-forward "^\\[GNUPG:] GOODSIG\\>" nil t)))) (defun pgg-gpg-insert-key () "Insert public key at point." (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id)) (args (list "--export" "--armor" pgg-gpg-user-id)) (process (pgg-gpg-start-process args))) (pgg-gpg-wait-for-process process) (insert-buffer-substring pgg-output-buffer))) (defun pgg-gpg-snarf-keys-region (start end) "Add all public keys in region between START and END to the keyring." (let* ((args '("--import" "-")) (process (pgg-gpg-start-process args)) status) (process-send-region process start end) (process-send-eof process) (pgg-gpg-wait-for-process process) (set-buffer pgg-errors-buffer) (goto-char (point-min)) (when (re-search-forward "^\\[GNUPG:] IMPORT_RES\\>" nil t) (setq status (buffer-substring (match-end 0) (progn (end-of-line)(point))) status (vconcat (mapcar #'string-to-number (split-string status)))) (erase-buffer) (insert (format "Imported %d key(s). \tArmor contains %d key(s) [%d bad, %d old].\n" (+ (aref status 2) (aref status 10)) (aref status 0) (aref status 1) (+ (aref status 4) (aref status 11))) (if (zerop (aref status 9)) "" "\tSecret keys are imported.\n"))) (append-to-buffer pgg-output-buffer (point-min)(point-max)) (pgg-process-when-success))) (provide 'pgg-gpg) ;;; arch-tag: 2aa5d5d8-93a0-4865-9312-33e29830e000 ;;; pgg-gpg.el ends here --Multipart_Thu_Mar_23_19:40:08_2006-1 Content-Type: text/plain; charset=US-ASCII Regards, -- Daiki Ueno --Multipart_Thu_Mar_23_19:40:08_2006-1 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-devel mailing list Emacs-devel@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-devel --Multipart_Thu_Mar_23_19:40:08_2006-1--