Mercurial > emacs
view lisp/epa-file.el @ 110264:ec526909f60b
Migrate to Tramp 2.2. Rearrange load dependencies.
(Bug#1529, Bug#5448, Bug#5705)
* Makefile.in (TRAMP_DIR, TRAMP_SRC): New variables.
($(TRAMP_DIR)/tramp-loaddefs.el): New target.
(LOADDEFS): Add $(lisp)/net/tramp-loaddefs.el.
* net/tramp.el (top): Remove all other tramp-* loads except
tramp-compat.el. Remove all changes to tramp-unload-hook for
other tramp-* packages. Rearrange defun order. Change calls of
`tramp-compat-call-process', `tramp-compat-decimal-to-octal',
`tramp-compat-octal-to-decimal' to new function names.
(tramp-terminal-type, tramp-initial-end-of-output)
(tramp-methods, tramp-foreign-file-name-handler-alist)
(tramp-tramp-file-p, tramp-completion-mode-p)
(tramp-send-command-and-check, tramp-get-remote-path)
(tramp-get-remote-tmpdir, tramp-get-remote-ln)
(tramp-shell-quote-argument): Set tramp-autoload cookie.
(with-file-property, with-connection-property): Move to
tramp-cache.el.
(tramp-local-call-process, tramp-decimal-to-octal)
(tramp-octal-to-decimal): Move to tramp-compat.el.
(tramp-handle-shell-command): Do not require 'shell.
(tramp-compute-multi-hops): No special handling for tramp-gw-*
symbols.
(tramp-unload-tramp): Do not call `tramp-unload-file-name-handlers'.
* net/tramp-cache.el (top): Require 'tramp. Add to
`tramp-unload-hook'.
(tramp-cache-data, tramp-get-file-property)
(tramp-set-file-property, tramp-flush-file-property)
(tramp-flush-directory-property, tramp-get-connection-property)
(tramp-set-connection-property, tramp-flush-connection-property)
(tramp-cache-print, tramp-list-connections): Set tramp-autoload
cookie.
(with-file-property, with-connection-property): New defuns, moved
from tramp.el.
(tramp-flush-file-function): Use `with-parsed-tramp-file-name'
macro.
* net/tramp-cmds.el (top): Add to `tramp-unload-hook'.
(tramp-version): Set tramp-autoload cookie.
* net/tramp-compat.el (top): Require 'tramp-loaddefs. Remove all
changes to tramp-unload-hook for other tramp-* packages. Add to
`tramp-unload-hook'.
(tramp-compat-decimal-to-octal, tramp-compat-octal-to-decimal)
(tramp-compat-call-process): New defuns, moved from tramp.el.
* net/tramp-fish.el (top) Require just 'tramp. Add objects to
`tramp-methods' and `tramp-foreign-file-name-handler-alist'. Add
to `tramp-unload-hook'. Change call of
`tramp-compat-decimal-to-octal' to new function name.
(tramp-fish-method): Make it a defconst.
(tramp-fish-file-name-p): Make it a defsubst.
(tramp-fish-method, tramp-fish-file-name-handler)
(tramp-fish-file-name-p): Set tramp-autoload cookie.
* net/tramp-ftp.el (top) Add objects to `tramp-methods' and
`tramp-foreign-file-name-handler-alist'. Add to
`tramp-unload-hook'.
(tramp-ftp-method): Make it a defconst.
(tramp-ftp-file-name-p): Make it a defsubst.
(tramp-ftp-method, tramp-ftp-file-name-handler)
(tramp-ftp-file-name-p): Set tramp-autoload cookie.
* net/tramp-gvfs.el (top) Add objects to `tramp-methods' and
`tramp-foreign-file-name-handler-alist'. Add to
`tramp-unload-hook'. Change checks, whether package can be
loaded.
(tramp-gvfs-file-name-p): Make it a defsubst.
(tramp-gvfs-methods, tramp-gvfs-file-name-handler)
(tramp-gvfs-file-name-p): Set tramp-autoload cookie.
(tramp-gvfs-handle-file-directory-p): New defun.
(tramp-gvfs-file-name-handler-alist): Use it.
* net/tramp-gw.el (top) Add objects to `tramp-methods' and
`tramp-foreign-file-name-handler-alist'. Add to
`tramp-unload-hook'.
(tramp-gw-tunnel-method, tramp-gw-default-tunnel-port)
(tramp-gw-socks-method, tramp-gw-default-socks-port): Make it a
defconst.
(tramp-gw-tunnel-method, tramp-gw-socks-method)
(tramp-gw-open-connection): Set tramp-autoload cookie.
* net/tramp-imap.el (top) Require just 'tramp. Add objects to
`tramp-methods' and `tramp-foreign-file-name-handler-alist'. Add
to `tramp-unload-hook'. Change checks, whether package can be
loaded.
(tramp-imap-file-name-p): Make it a defsubst.
(tramp-imap-method, tramp-imaps-method)
(tramp-imap-file-name-handler)
(tramp-imap-file-name-p): Set tramp-autoload cookie.
* net/tramp-smb.el (top) Require just 'tramp. Add objects to
`tramp-methods' and `tramp-foreign-file-name-handler-alist'. Add
to `tramp-unload-hook'. Change checks, whether package can be
loaded. Change call of `tramp-compat-decimal-to-octal' to new
function name.
(tramp-smb-tunnel-method): Make it a defconst.
(tramp-smb-file-name-p): Make it a defsubst.
(tramp-smb-method, tramp-smb-file-name-handler)
(tramp-smb-file-name-p): Set tramp-autoload cookie.
* net/tramp-uu.el (top) Add to `tramp-unload-hook'.
(tramp-uuencode-region): Set tramp-autoload cookie.
* net/trampver.el (top) Add to `tramp-unload-hook'.
(tramp-version, tramp-bug-report-address): Set tramp-autoload
cookie. Update release number.
author | Michael Albinus <michael.albinus@gmx.de> |
---|---|
date | Wed, 08 Sep 2010 16:42:54 +0200 |
parents | 280c8ae2476d |
children | 3386110d149b |
line wrap: on
line source
;;; epa-file.el --- the EasyPG Assistant, transparent file encryption ;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Keywords: PGP, GnuPG ;; Package: epa ;; 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 3 of the License, 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. If not, see <http://www.gnu.org/licenses/>. ;;; Code: (require 'epa) (require 'epa-hook) (defcustom epa-file-cache-passphrase-for-symmetric-encryption nil "If non-nil, cache passphrase for symmetric encryption. For security reasons, this option is turned off by default and not recommended to use. Instead, consider using public-key encryption with gpg-agent which does the same job in a safer way." :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-passphrase-alist nil) (eval-and-compile (if (fboundp 'encode-coding-string) (defalias 'epa-file--encode-coding-string 'encode-coding-string) (defalias 'epa-file--encode-coding-string 'identity))) (eval-and-compile (if (fboundp 'decode-coding-string) (defalias 'epa-file--decode-coding-string 'decode-coding-string) (defalias 'epa-file--decode-coding-string 'identity))) (defun epa-file-passphrase-callback-function (context key-id file) (if (and epa-file-cache-passphrase-for-symmetric-encryption (eq key-id 'SYM)) (progn (setq file (file-truename file)) (let ((entry (assoc file epa-file-passphrase-alist)) passphrase) (or (copy-sequence (cdr entry)) (progn (unless entry (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)))) (epa-passphrase-callback-function context key-id nil))) ;;;###autoload (defun epa-file-handler (operation &rest args) (save-match-data (let ((op (get operation 'epa-file))) (if op (apply op args) (epa-file-run-real-handler operation args))))) (defun epa-file-run-real-handler (operation args) (let ((inhibit-file-name-handlers (cons 'epa-file-handler (and (eq inhibit-file-name-operation operation) inhibit-file-name-handlers))) (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)) (insert (if enable-multibyte-characters (string-to-multibyte string) string)) (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 epa-file-error nil) (defun epa-file--find-file-not-found-function () (let ((error epa-file-error)) (save-window-excursion (kill-buffer)) (signal 'file-error (cons "Opening input file" (cdr error))))) (defvar last-coding-system-used) (defun epa-file-insert-file-contents (file &optional visit beg end replace) (barf-if-buffer-read-only) (if (and visit (or beg end)) (error "Attempt to visit less than an entire file")) (setq file (expand-file-name file)) (let* ((local-copy (condition-case nil (epa-file-run-real-handler #'file-local-copy (list file)) (error))) (local-file (or local-copy file)) (context (epg-make-context)) string length entry) (if visit (setq buffer-file-name file)) (epg-context-set-passphrase-callback context (cons #'epa-file-passphrase-callback-function local-file)) (epg-context-set-progress-callback context #'epa-progress-callback-function) (unwind-protect (progn (if replace (goto-char (point-min))) (condition-case error (setq string (epg-decrypt-file context local-file nil)) (error (if (setq entry (assoc file epa-file-passphrase-alist)) (setcdr entry nil)) ;; Hack to prevent find-file from opening empty buffer ;; when decryption failed (bug#6568). See the place ;; where `find-file-not-found-functions' are called in ;; `find-file-noselect-1'. (when (file-exists-p local-file) (make-local-variable 'epa-file-error) (setq epa-file-error error) (add-hook 'find-file-not-found-functions 'epa-file--find-file-not-found-function nil t)) (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))) (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 visit (set-visited-file-modtime)))) (if (and local-copy (file-exists-p local-copy)) (delete-file local-copy))) (list file length))) (put 'insert-file-contents 'epa-file 'epa-file-insert-file-contents) (defun epa-file-write-region (start end file &optional append visit lockname mustbenew) (if append (error "Can't append to the file")) (setq file (expand-file-name file)) (let* ((coding-system (or coding-system-for-write (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 (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) (epg-context-set-armor context epa-armor) (condition-case error (setq string (epg-encrypt-string context (if (stringp start) (epa-file--encode-coding-string start coding-system) (unless start (setq start (point-min) end (point-max))) (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 (current-buffer)))) (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)) (signal 'file-error (cons "Opening output file" (cdr error))))) (epa-file-run-real-handler #'write-region (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) (progn (setq buffer-file-name file) (set-visited-file-modtime)) (if (stringp visit) (progn (set-visited-file-modtime) (setq buffer-file-name visit)))) (if (or (eq visit t) (eq visit nil) (stringp visit)) (message "Wrote %s" buffer-file-name)))) (put 'write-region 'epa-file 'epa-file-write-region) (defun epa-file-select-keys () "Select recipients for encryption." (interactive) (make-local-variable 'epa-file-encrypt-to) (setq epa-file-encrypt-to (mapcar (lambda (key) (epg-sub-key-id (car (epg-key-sub-key-list key)))) (epa-select-keys (epg-make-context) "Select recipents for encryption. If no one is selected, symmetric encryption will be performed. ")))) ;;;###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)) (add-hook 'find-file-hook 'epa-file-find-file-hook) (setq auto-mode-alist (cons epa-file-auto-mode-alist-entry auto-mode-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)) (remove-hook 'find-file-hook 'epa-file-find-file-hook) (setq auto-mode-alist (delq epa-file-auto-mode-alist-entry auto-mode-alist)) (message "`epa-file' disabled")) (message "`epa-file' already disabled"))) (provide 'epa-file) ;; arch-tag: 5715152f-0eb1-4dbc-9008-07098775314d ;;; epa-file.el ends here