X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa-file.el;h=9828b65fd02db2f979cb1b6fbcb1426b5572b2c9;hb=19a0543dfa1784253d2e0ea46ab9841cca71a6a5;hp=d02e7890a168eecd9819e09d6af3aff34d83b0fa;hpb=a435a82ee2ae8ce526c53aa18b9e92e2ff9da22b;p=elisp%2Fepg.git diff --git a/epa-file.el b/epa-file.el index d02e789..9828b65 100644 --- a/epa-file.el +++ b/epa-file.el @@ -29,18 +29,77 @@ "The EasyPG Assistant hooks for transparent file encryption" :group 'epa) -(defcustom epa-file-name-regexp "\\.gpg\\'" - "Regexp which matches filenames to be encrypted with GnuPG." +(defun epa-file--file-name-regexp-set (variable value) + (set-default variable value) + (if (fboundp 'epa-file-name-regexp-update) + (epa-file-name-regexp-update))) + +(defcustom epa-file-name-regexp "\\.gpg\\(~\\|\\.~[0-9]+~\\)?\\'" + "Regexp which matches filenames to be encrypted with GnuPG. + +If you set this outside Custom while epa-file is already enabled, you +have to call `epa-file-name-regexp-update' after setting it to +properly update file-name-handler-alist. Setting this through Custom +does that automatically." :type 'regexp + :group 'epa-file + :set 'epa-file--file-name-regexp-set) + +(defcustom epa-file-cache-passphrase-for-symmetric-encryption nil + "If non-nil, cache passphrase for symmetric encryption." + :type 'boolean :group 'epa-file) +(defcustom epa-file-inhibit-auto-save t + "If non-nil, disable auto-saving when opening an encrypted file." + :type 'boolean + :group 'epa-file) + +(defcustom epa-file-select-keys nil + "If non-nil, always asks user to select recipients." + :type 'boolean + :group 'epa-file) + +(defvar epa-file-encrypt-to nil + "*Recipient(s) used for encrypting files. +May either be a string or a list of strings.") + +;;;###autoload +(put 'epa-file-encrypt-to 'safe-local-variable + (lambda (val) + (or (stringp val) + (and (listp val) + (catch 'safe + (mapc (lambda (elt) + (unless (stringp elt) + (throw 'safe nil))) + val) + t))))) + +;;;###autoload +(put 'epa-file-encrypt-to 'permanent-local t) + (defvar epa-file-handler (cons epa-file-name-regexp 'epa-file-handler)) - + (defvar epa-file-passphrase-alist nil) +(if (fboundp 'encode-coding-string) + (defalias 'epa-file--encode-coding-string 'encode-coding-string) + (defalias 'epa-file--encode-coding-string 'identity)) + +(if (fboundp 'decode-coding-string) + (defalias 'epa-file--decode-coding-string 'decode-coding-string) + (defalias 'epa-file--decode-coding-string 'identity)) + +(defun epa-file-name-regexp-update () + (interactive) + (unless (equal (car epa-file-handler) epa-file-name-regexp) + (setcar epa-file-handler epa-file-name-regexp))) + (defun epa-file-passphrase-callback-function (context key-id file) - (if (eq key-id 'SYM) + (if (and epa-file-cache-passphrase-for-symmetric-encryption + (eq key-id 'SYM)) (let ((entry (assoc file epa-file-passphrase-alist)) passphrase) (or (copy-sequence (cdr entry)) @@ -49,11 +108,11 @@ (setq entry (list file) epa-file-passphrase-alist (cons entry epa-file-passphrase-alist))) - (setq passphrase (epg-passphrase-callback-function context + (setq passphrase (epa-passphrase-callback-function context key-id nil)) (setcdr entry (copy-sequence passphrase)) passphrase))) - (epg-passphrase-callback-function context key-id nil))) + (epa-passphrase-callback-function context key-id nil))) (defun epa-file-handler (operation &rest args) (save-match-data @@ -70,6 +129,21 @@ (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 (epa-file--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) @@ -85,6 +159,8 @@ context (cons #'epa-file-passphrase-callback-function file)) + (epg-context-set-progress-callback context + #'epa-progress-callback-function) (unwind-protect (progn (if replace @@ -96,24 +172,16 @@ (setcdr entry nil)) (signal 'file-error (cons "Opening input file" (cdr error))))) + (make-local-variable 'epa-file-encrypt-to) + (setq epa-file-encrypt-to + (mapcar #'car (epg-context-result-for context 'encrypted-to))) (if (or beg end) (setq string (substring string (or beg 0) end))) - (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)) (save-excursion - (if (and (null coding-system-for-read) - (fboundp 'decode-coding-inserted-region)) - (save-restriction - (narrow-to-region (point) (point)) - (insert string) - (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)))) - (setq length (length string)) + (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 @@ -128,31 +196,45 @@ (error "Can't append to the file.")) (setq file (expand-file-name file)) (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)) + (if (fboundp 'select-safe-coding-system) + ;; This is needed since Emacs 22 has + ;; no-conversion setting for *.gpg in + ;; `auto-coding-alist'. + (let ((buffer-file-name + (file-name-sans-extension file))) + (select-safe-coding-system + (point-min) (point-max))) buffer-file-coding-system))) (context (epg-make-context)) (coding-system-for-write 'binary) - string entry) + string entry + (recipients + (cond + ((listp epa-file-encrypt-to) epa-file-encrypt-to) + ((stringp epa-file-encrypt-to) (list epa-file-encrypt-to))))) (epg-context-set-passphrase-callback context (cons #'epa-file-passphrase-callback-function 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. ")))) + (epa-file--encode-coding-string start coding-system) + (epa-file--encode-coding-string (buffer-substring start end) + coding-system)) + (if (or epa-file-select-keys + (not (local-variable-p 'epa-file-encrypt-to))) + (epa-select-keys + context + "Select recipents for encryption. +If no one is selected, symmetric encryption will be performed. " + recipients) + (if epa-file-encrypt-to + (epg-list-keys context recipients))))) (error (if (setq entry (assoc file epa-file-passphrase-alist)) (setcdr entry nil)) @@ -176,6 +258,22 @@ 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) +(defun epa-file-find-file-hook () + (if (and buffer-file-name + (string-match epa-file-name-regexp buffer-file-name) + epa-file-inhibit-auto-save) + (auto-save-mode 0))) + +(defun epa-file-select-keys () + "Select recipients for encryption." + (interactive) + (make-local-variable 'epa-file-encrypt-to) + (setq epa-file-encrypt-to + (epa-select-keys + context + "Select recipents for encryption. +If no one is selected, symmetric encryption will be performed. "))) + ;;;###autoload (defun epa-file-enable () (interactive) @@ -183,6 +281,7 @@ If no one is selected, symmetric encryption will be performed. ")))) (message "`epa-file' already enabled") (setq file-name-handler-alist (cons epa-file-handler file-name-handler-alist)) + (add-hook 'find-file-hooks 'epa-file-find-file-hook) (message "`epa-file' enabled"))) ;;;###autoload @@ -192,6 +291,7 @@ If no one is selected, symmetric encryption will be performed. ")))) (progn (setq file-name-handler-alist (delq epa-file-handler file-name-handler-alist)) + (remove-hook 'find-file-hooks 'epa-file-find-file-hook) (message "`epa-file' disabled")) (message "`epa-file' already disabled")))