X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa-file.el;h=ff5b65fa9f67cf6f2c3e37785195c3993173397e;hb=6e164d33d0237c8236db853fa03528fb29c7e0cd;hp=d0d194fc014006a90c1c30e313f694955bc4c132;hpb=ac3c5f1e851519e110b8d908d388b48221334e66;p=elisp%2Fepg.git diff --git a/epa-file.el b/epa-file.el index d0d194f..ff5b65f 100644 --- a/epa-file.el +++ b/epa-file.el @@ -1,4 +1,4 @@ -;;; epa-file.el --- the EasyPG Assistant hooks for transparent file encryption +;;; epa-file.el --- the EasyPG Assistant, transparent file encryption ;; Copyright (C) 2006 Daiki Ueno ;; Author: Daiki Ueno @@ -33,23 +33,33 @@ "Regexp which matches filenames to be encrypted with GnuPG." :type 'regexp :group 'epa-file) - -(defvar epa-passphrase-alist nil) -(defun epa-file-passphrase-callback-function (key-id buffer) - (if (eq key-id 'SYM) - (let ((entry (assoc buffer epa-passphrase-alist)) +(defcustom epa-file-cache-passphrase-for-symmetric-encryption nil + "If t, cache passphrase for symmetric encryption." + :type 'boolean + :group 'epa-file) + +(defvar epa-file-handler + (cons epa-file-name-regexp 'epa-file-handler)) + +(defvar epa-file-passphrase-alist nil) + +(defun epa-file-passphrase-callback-function (context key-id file) + (if (and epa-file-cache-passphrase-for-symmetric-encryption + (eq key-id 'SYM)) + (let ((entry (assoc file epa-file-passphrase-alist)) passphrase) - (or (cdr entry) + (or (copy-sequence (cdr entry)) (progn (unless entry - (setq entry (list buffer) - epa-passphrase-alist (cons entry - epa-passphrase-alist))) - (setq passphrase (epg-passphrase-callback-function key-id nil)) + (setq entry (list file) + epa-file-passphrase-alist (cons entry + epa-file-passphrase-alist))) + (setq passphrase (epa-passphrase-callback-function context + key-id nil)) (setcdr entry (copy-sequence passphrase)) passphrase))) - (epg-passphrase-callback-function key-id nil))) + (epa-passphrase-callback-function context key-id nil))) (defun epa-file-handler (operation &rest args) (save-match-data @@ -66,39 +76,58 @@ (inhibit-file-name-operation operation)) (apply operation args))) +(defun epa-file-decode-and-insert (string file visit beg end replace) + (if (fboundp 'decode-coding-inserted-region) + (save-restriction + (narrow-to-region (point) (point)) + (let ((multibyte enable-multibyte-characters)) + (set-buffer-multibyte nil) + (insert string) + (set-buffer-multibyte multibyte) + (decode-coding-inserted-region + (point-min) (point-max) + (substring file 0 (string-match epa-file-name-regexp file)) + visit beg end replace))) + (insert (decode-coding-string string (or coding-system-for-read + 'undecided))))) + (defvar last-coding-system-used) (defun epa-file-insert-file-contents (file &optional visit beg end replace) (barf-if-buffer-read-only) - (if (or beg end) - (error "Can't read the file partially.")) + (if (and visit (or beg end)) + (error "Attempt to visit less than an entire file")) (setq file (expand-file-name file)) (let ((local-copy (epa-file-run-real-handler #'file-local-copy (list file))) (context (epg-make-context)) - point length entry) + string length entry) (if visit (setq buffer-file-name file)) (epg-context-set-passphrase-callback context (cons #'epa-file-passphrase-callback-function - (current-buffer))) + file)) + (epg-context-set-progress-callback context + #'epa-progress-callback-function) (unwind-protect (progn (if replace (goto-char (point-min))) - (setq point (point)) (condition-case error - (insert (epg-decrypt-file context file nil)) - (error (signal 'file-error - (cons "Opening input file" - (nthcdr 2 error))))) - (setq length (- (point) point)) - (if replace - (delete-region (point) (point-max))) - (decode-coding-region point (point) 'undecided) - (if (boundp 'last-coding-system-used) - (set-buffer-file-coding-system last-coding-system-used) - (set-buffer-file-coding-system default-buffer-file-coding-system)) - (goto-char point)) + (setq string (epg-decrypt-file context file nil)) + (error + (if (setq entry (assoc file epa-file-passphrase-alist)) + (setcdr entry nil)) + (signal 'file-error + (cons "Opening input file" (cdr error))))) + (if (or beg end) + (setq string (substring string (or beg 0) end))) + (save-excursion + (save-restriction + (narrow-to-region (point) (point)) + (epa-file-decode-and-insert string file visit beg end replace) + (setq length (- (point-max) (point-min)))) + (if replace + (delete-region (point) (point-max))))) (if (and local-copy (file-exists-p local-copy)) (delete-file local-copy))) @@ -110,29 +139,41 @@ (if append (error "Can't append to the file.")) (setq file (expand-file-name file)) - (let* ((coding-system (if (boundp 'last-coding-system-used) - (condition-case nil - (write-region (point-min) (point-max) "/") - (error last-coding-system-used)) - buffer-file-coding-system)) + (let* ((coding-system (or coding-system-for-write + (if (boundp 'last-coding-system-used) + (condition-case nil + (write-region (point-min) (point-max) "/") + (error last-coding-system-used)) + buffer-file-coding-system))) (context (epg-make-context)) - (coding-system-for-write 'binary)) + (coding-system-for-write 'binary) + string entry) (epg-context-set-passphrase-callback context (cons #'epa-file-passphrase-callback-function - (current-buffer))) + file)) + (epg-context-set-progress-callback context + #'epa-progress-callback-function) + (condition-case error + (setq string + (epg-encrypt-string + context + (if (stringp start) + (encode-coding-string start coding-system) + (encode-coding-string (buffer-substring start end) + coding-system)) + (unless (assoc file epa-file-passphrase-alist) + (epa-select-keys + context + "Select recipents for encryption. +If no one is selected, symmetric encryption will be performed. ")))) + (error + (if (setq entry (assoc file epa-file-passphrase-alist)) + (setcdr entry nil)) + (signal 'file-error (cons "Opening output file" (cdr error))))) (epa-file-run-real-handler #'write-region - (list (epg-encrypt-string - context - (encode-coding-string (buffer-string) coding-system) - (mapcar (lambda (key) - (epg-sub-key-id (car (epg-key-sub-key-list key)))) - (unless (assoc (current-buffer) epa-passphrase-alist) - (epa-select-keys - "Select recipents for encryption. -If no one is selected, symmetric encryption will be performed. ")))) - nil file append visit lockname mustbenew)) + (list string nil file append visit lockname mustbenew)) (if (boundp 'last-coding-system-used) (setq last-coding-system-used coding-system)) (if (eq visit t) @@ -149,6 +190,25 @@ If no one is selected, symmetric encryption will be performed. ")))) (message "Wrote %s" buffer-file-name)))) (put 'write-region 'epa-file 'epa-file-write-region) +;;;###autoload +(defun epa-file-enable () + (interactive) + (if (memq epa-file-handler file-name-handler-alist) + (message "`epa-file' already enabled") + (setq file-name-handler-alist + (cons epa-file-handler file-name-handler-alist)) + (message "`epa-file' enabled"))) + +;;;###autoload +(defun epa-file-disable () + (interactive) + (if (memq epa-file-handler file-name-handler-alist) + (progn + (setq file-name-handler-alist + (delq epa-file-handler file-name-handler-alist)) + (message "`epa-file' disabled")) + (message "`epa-file' already disabled"))) + (provide 'epa-file) ;;; epa-file.el ends here