mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-14 09:39:42 +00:00
4acdd7fe58
These changes fix actual or latent bugs in regexps that match file names, such as PATTERN arguments to 'directory-files'. See https://lists.gnu.org/archive/html/emacs-devel/2020-04/msg00265.html * admin/authors.el (authors-obsolete-files-regexps) (authors-renamed-files-regexps): * lisp/auth-source-pass.el (auth-source-pass-entries): * lisp/calendar/todo-mode.el (todo-show, todo-find-filtered-items-file) (todo-filter-items, todo-reset-nondiary-marker, todo-reset-done-string) (todo-reset-comment-string, todo-reset-highlight-item): * lisp/cedet/semantic/db-ebrowse.el (semanticdb-load-ebrowse-caches): * lisp/cedet/semantic/texi.el (semantic-texi-associated-files): * lisp/cedet/srecode/map.el (srecode-map-update-map): * lisp/dired.el (dired-re-no-dot): * lisp/emacs-lisp/autoload.el (update-directory-autoloads): * lisp/emacs-lisp/shadow.el (load-path-shadows-find): * lisp/files.el (auto-mode-alist, directory-files-no-dot-files-regexp): * lisp/finder.el (finder-compile-keywords): * lisp/generic-x.el (inetd-conf-generic-mode, named-boot-generic-mode) (resolve-conf-generic-mode, etc-modules-conf-generic-mode): * lisp/gnus/gnus-agent.el (gnus-agent-read-agentview) (gnus-agent-regenerate-group, gnus-agent-update-files-total-fetched-for): * lisp/gnus/gnus-cache.el (gnus-cache-articles-in-group): * lisp/gnus/gnus-score.el (gnus-score-search-global-directories): * lisp/gnus/gnus-util.el (gnus-delete-directory): * lisp/gnus/gnus-uu.el (gnus-uu-dir-files): * lisp/gnus/nndraft.el (nndraft-request-group): * lisp/gnus/nnmh.el (nnmh-request-group, nnmh-request-create-group): (nnmh-request-delete-group, nnmh-active-number, nnmh-update-gnus-unreads): * lisp/gnus/nnspool.el (nnspool-request-group): * lisp/gnus/spam-stat.el (spam-stat-process-directory) (spam-stat-test-directory): * lisp/help-fns.el (help-fns--first-release): * lisp/help.el (view-emacs-news): * lisp/international/quail.el (quail-update-leim-list-file): * lisp/international/titdic-cnv.el (batch-titdic-convert): * lisp/mail/mspools.el (mspools-set-vm-spool-files) (mspools-get-spool-files): * lisp/mail/rmail.el (rmail-secondary-file-regexp) (rmail-speedbar-match-folder-regexp): * lisp/net/ange-ftp.el (ange-ftp-delete-directory): * lisp/net/tramp.el (tramp-use-absolute-autoload-file-names): * lisp/obsolete/gulp.el (gulp-send-requests): * lisp/obsolete/vc-arch.el (vc-arch-trim-revlib): * lisp/org/ob-core.el (org-babel-remove-temporary-directory): * lisp/progmodes/ebnf2ps.el (ebnf-file-suffix-regexp, ebnf-style-database): * lisp/progmodes/executable.el (executable-command-find-posix-p): * lisp/startup.el (command-line): * lisp/textmodes/refer.el (refer-get-bib-files): * lisp/url/url-about.el (url-probe-protocols): * lisp/vc/vc-rcs.el (vc-rcs-register, vc-rcs-unregister): * test/lisp/net/tramp-archive-tests.el (tramp-archive-test19-directory-files-and-attributes): * test/lisp/net/tramp-tests.el (tramp-test19-directory-files-and-attributes): Replace ^ and $ with \` and \', respectively. Use (rx (or (not ".") "...")), translated into "[^.]\\|\\.\\.\\.", to match anything but "." and "..", instead of several incorrect regexps.
317 lines
13 KiB
EmacsLisp
317 lines
13 KiB
EmacsLisp
;;; auth-source-pass.el --- Integrate auth-source with password-store -*- lexical-binding: t -*-
|
||
|
||
;; Copyright (C) 2015, 2017-2020 Free Software Foundation, Inc.
|
||
|
||
;; Author: Damien Cassou <damien@cassou.me>,
|
||
;; Nicolas Petton <nicolas@petton.fr>
|
||
;; Keith Amidon <camalot@picnicpark.org>
|
||
;; Version: 5.0.0
|
||
;; Package-Requires: ((emacs "25"))
|
||
;; Url: https://github.com/DamienCassou/auth-password-store
|
||
;; Created: 07 Jun 2015
|
||
|
||
;; 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 <https://www.gnu.org/licenses/>.
|
||
|
||
;;; Commentary:
|
||
|
||
;; Integrates password-store (http://passwordstore.org/) within
|
||
;; auth-source.
|
||
|
||
;;; Code:
|
||
|
||
(require 'seq)
|
||
(eval-when-compile (require 'subr-x))
|
||
(require 'cl-lib)
|
||
(require 'auth-source)
|
||
(require 'url-parse)
|
||
|
||
(defgroup auth-source-pass nil
|
||
"password-store integration within auth-source."
|
||
:prefix "auth-source-pass-"
|
||
:group 'auth-source
|
||
:version "27.1")
|
||
|
||
(defcustom auth-source-pass-filename
|
||
(or (getenv "PASSWORD_STORE_DIR") "~/.password-store")
|
||
"Filename of the password-store folder."
|
||
:type 'directory
|
||
:version "27.1")
|
||
|
||
(defcustom auth-source-pass-port-separator ":"
|
||
"Separator string between host and port in entry filename."
|
||
:type 'string
|
||
:version "27.1")
|
||
|
||
(cl-defun auth-source-pass-search (&rest spec
|
||
&key backend type host user port
|
||
&allow-other-keys)
|
||
"Given a property list SPEC, return search matches from the :backend.
|
||
See `auth-source-search' for details on SPEC."
|
||
(cl-assert (or (null type) (eq type (oref backend type)))
|
||
t "Invalid password-store search: %s %s")
|
||
(when (consp host)
|
||
(warn "auth-source-pass ignores all but first host in spec.")
|
||
;; Take the first non-nil item of the list of hosts
|
||
(setq host (seq-find #'identity host)))
|
||
(cond ((eq host t)
|
||
(warn "auth-source-pass does not handle host wildcards.")
|
||
nil)
|
||
((null host)
|
||
;; Do not build a result, as none will match when HOST is nil
|
||
nil)
|
||
(t
|
||
(when-let ((result (auth-source-pass--build-result host port user)))
|
||
(list result)))))
|
||
|
||
(defun auth-source-pass--build-result (host port user)
|
||
"Build auth-source-pass entry matching HOST, PORT and USER."
|
||
(let ((entry-data (auth-source-pass--find-match host user port)))
|
||
(when entry-data
|
||
(let ((retval (list
|
||
:host host
|
||
:port (or (auth-source-pass--get-attr "port" entry-data) port)
|
||
:user (or (auth-source-pass--get-attr "user" entry-data) user)
|
||
:secret (lambda () (auth-source-pass--get-attr 'secret entry-data)))))
|
||
(auth-source-pass--do-debug "return %s as final result (plus hidden password)"
|
||
(seq-subseq retval 0 -2)) ;; remove password
|
||
retval))))
|
||
|
||
;;;###autoload
|
||
(defun auth-source-pass-enable ()
|
||
"Enable auth-source-password-store."
|
||
;; To add password-store to the list of sources, evaluate the following:
|
||
(add-to-list 'auth-sources 'password-store)
|
||
;; clear the cache (required after each change to #'auth-source-pass-search)
|
||
(auth-source-forget-all-cached))
|
||
|
||
(defvar auth-source-pass-backend
|
||
(auth-source-backend
|
||
(when (<= emacs-major-version 25) "password-store")
|
||
:source "." ;; not used
|
||
:type 'password-store
|
||
:search-function #'auth-source-pass-search)
|
||
"Auth-source backend for password-store.")
|
||
|
||
(defun auth-source-pass-backend-parse (entry)
|
||
"Create a password-store auth-source backend from ENTRY."
|
||
(when (eq entry 'password-store)
|
||
(auth-source-backend-parse-parameters entry auth-source-pass-backend)))
|
||
|
||
(if (boundp 'auth-source-backend-parser-functions)
|
||
(add-hook 'auth-source-backend-parser-functions #'auth-source-pass-backend-parse)
|
||
(advice-add 'auth-source-backend-parse :before-until #'auth-source-pass-backend-parse))
|
||
|
||
|
||
;;;###autoload
|
||
(defun auth-source-pass-get (key entry)
|
||
"Return the value associated to KEY in the password-store entry ENTRY.
|
||
|
||
ENTRY is the name of a password-store entry.
|
||
The key used to retrieve the password is the symbol `secret'.
|
||
|
||
The convention used as the format for a password-store file is
|
||
the following (see http://www.passwordstore.org/#organization):
|
||
|
||
secret
|
||
key1: value1
|
||
key2: value2"
|
||
(let ((data (auth-source-pass-parse-entry entry)))
|
||
(auth-source-pass--get-attr key data)))
|
||
|
||
(defun auth-source-pass--get-attr (key entry-data)
|
||
"Return value associated with KEY in an ENTRY-DATA.
|
||
|
||
ENTRY-DATA is the data from a parsed password-store entry.
|
||
The key used to retrieve the password is the symbol `secret'.
|
||
|
||
See `auth-source-pass-get'."
|
||
(or (cdr (assoc key entry-data))
|
||
(and (string= key "user")
|
||
(cdr (assoc "username" entry-data)))))
|
||
|
||
(defun auth-source-pass--read-entry (entry)
|
||
"Return a string with the file content of ENTRY."
|
||
(with-temp-buffer
|
||
(insert-file-contents (expand-file-name
|
||
(format "%s.gpg" entry)
|
||
auth-source-pass-filename))
|
||
(buffer-substring-no-properties (point-min) (point-max))))
|
||
|
||
(defun auth-source-pass-parse-entry (entry)
|
||
"Return an alist of the data associated with ENTRY.
|
||
|
||
ENTRY is the name of a password-store entry."
|
||
(let ((file-contents (ignore-errors (auth-source-pass--read-entry entry))))
|
||
(and file-contents
|
||
(cons `(secret . ,(auth-source-pass--parse-secret file-contents))
|
||
(auth-source-pass--parse-data file-contents)))))
|
||
|
||
(defun auth-source-pass--parse-secret (contents)
|
||
"Parse the password-store data in the string CONTENTS and return its secret.
|
||
The secret is the first line of CONTENTS."
|
||
(car (split-string contents "\n" t)))
|
||
|
||
(defun auth-source-pass--parse-data (contents)
|
||
"Parse the password-store data in the string CONTENTS and return an alist.
|
||
CONTENTS is the contents of a password-store formatted file."
|
||
(let ((lines (split-string contents "\n" t "[ \t]+")))
|
||
(seq-remove #'null
|
||
(mapcar (lambda (line)
|
||
(let ((pair (mapcar (lambda (s) (string-trim s))
|
||
(split-string line ":"))))
|
||
(when (> (length pair) 1)
|
||
(cons (car pair)
|
||
(mapconcat #'identity (cdr pair) ":")))))
|
||
(cdr lines)))))
|
||
|
||
(defun auth-source-pass--do-debug (&rest msg)
|
||
"Call `auth-source-do-debug` with MSG and a prefix."
|
||
(apply #'auth-source-do-debug
|
||
(cons (concat "auth-source-pass: " (car msg))
|
||
(cdr msg))))
|
||
|
||
;; TODO: add tests for that when `assess-with-filesystem' is included
|
||
;; in Emacs
|
||
(defun auth-source-pass-entries ()
|
||
"Return a list of all password store entries."
|
||
(let ((store-dir (expand-file-name auth-source-pass-filename)))
|
||
(mapcar
|
||
(lambda (file) (file-name-sans-extension (file-relative-name file store-dir)))
|
||
(directory-files-recursively store-dir "\\.gpg\\'"))))
|
||
|
||
(defun auth-source-pass--find-match (host user port)
|
||
"Return password-store entry data matching HOST, USER and PORT.
|
||
|
||
Disambiguate between user provided inside HOST (e.g., user@server.com) and
|
||
inside USER by giving priority to USER. Same for PORT."
|
||
(apply #'auth-source-pass--find-match-unambiguous (auth-source-pass--disambiguate host user port)))
|
||
|
||
(defun auth-source-pass--disambiguate (host &optional user port)
|
||
"Return (HOST USER PORT) after disambiguation.
|
||
Disambiguate between having user provided inside HOST (e.g.,
|
||
user@server.com) and inside USER by giving priority to USER.
|
||
Same for PORT."
|
||
(let* ((url (url-generic-parse-url (if (string-match-p ".*://" host)
|
||
host
|
||
(format "https://%s" host)))))
|
||
(list
|
||
(or (url-host url) host)
|
||
(or user (url-user url))
|
||
;; url-port returns 443 (because of the https:// above) by default
|
||
(or port (number-to-string (url-port url))))))
|
||
|
||
(defun auth-source-pass--find-match-unambiguous (hostname user port)
|
||
"Return password-store entry data matching HOSTNAME, USER and PORT.
|
||
If many matches are found, return the first one. If no match is found,
|
||
return nil.
|
||
|
||
HOSTNAME should not contain any username or port number."
|
||
(let ((all-entries (auth-source-pass-entries))
|
||
(suffixes (auth-source-pass--generate-entry-suffixes hostname user port)))
|
||
(auth-source-pass--do-debug "searching for entries matching hostname=%S, user=%S, port=%S"
|
||
hostname (or user "") (or port ""))
|
||
(auth-source-pass--do-debug "corresponding suffixes to search for: %S" suffixes)
|
||
(catch 'auth-source-pass-break
|
||
(dolist (suffix suffixes)
|
||
(let* ((matching-entries (auth-source-pass--entries-matching-suffix suffix all-entries))
|
||
(best-entry-data (auth-source-pass--select-from-entries matching-entries user)))
|
||
(pcase (length matching-entries)
|
||
(0 (auth-source-pass--do-debug "found no entries matching %S" suffix))
|
||
(1 (auth-source-pass--do-debug "found 1 entry matching %S: %S"
|
||
suffix
|
||
(car matching-entries)))
|
||
(_ (auth-source-pass--do-debug "found %s entries matching %S: %S"
|
||
(length matching-entries)
|
||
suffix
|
||
matching-entries)))
|
||
(when best-entry-data
|
||
(throw 'auth-source-pass-break best-entry-data)))))))
|
||
|
||
(defun auth-source-pass--select-from-entries (entries user)
|
||
"Return best matching password-store entry data from ENTRIES.
|
||
|
||
If USER is non-nil, give precedence to entries containing a user field
|
||
matching USER."
|
||
(let (fallback)
|
||
(catch 'auth-source-pass-break
|
||
(dolist (entry entries fallback)
|
||
(let ((entry-data (auth-source-pass-parse-entry entry)))
|
||
(when (and entry-data (not fallback))
|
||
(setq fallback entry-data)
|
||
(when (or (not user) (equal (auth-source-pass--get-attr "user" entry-data) user))
|
||
(throw 'auth-source-pass-break entry-data))))))))
|
||
|
||
(defun auth-source-pass--entries-matching-suffix (suffix entries)
|
||
"Return entries matching SUFFIX.
|
||
If ENTRIES is nil, use the result of calling `auth-source-pass-entries' instead."
|
||
(cl-remove-if-not
|
||
(lambda (entry) (string-match-p
|
||
(format "\\(^\\|/\\)%s$" (regexp-quote suffix))
|
||
entry))
|
||
(or entries (auth-source-pass-entries))))
|
||
|
||
(defun auth-source-pass--generate-entry-suffixes (hostname user port)
|
||
"Return a list of possible entry path suffixes in the password-store.
|
||
|
||
Based on the supported pathname patterns for HOSTNAME, USER, &
|
||
PORT, return a list of possible suffixes for matching entries in
|
||
the password-store.
|
||
|
||
PORT may be a list of ports."
|
||
(let ((domains (auth-source-pass--domains (split-string hostname "\\."))))
|
||
(seq-mapcat (lambda (domain)
|
||
(seq-mapcat
|
||
(lambda (p)
|
||
(auth-source-pass--name-port-user-suffixes domain user p))
|
||
(if (consp port) port (list port))))
|
||
domains)))
|
||
|
||
(defun auth-source-pass--domains (name-components)
|
||
"Return a list of possible domain names matching the hostname.
|
||
|
||
This function takes a list of NAME-COMPONENTS, the strings
|
||
separated by periods in the hostname, and returns a list of full
|
||
domain names containing the trailing sequences of those
|
||
components, from longest to shortest."
|
||
(cl-maplist (lambda (components) (mapconcat #'identity components "."))
|
||
name-components))
|
||
|
||
(defun auth-source-pass--name-port-user-suffixes (name user port)
|
||
"Return a list of possible path suffixes for NAME, USER, & PORT.
|
||
|
||
The resulting list is ordered from most specific to least
|
||
specific, with paths matching all of NAME, USER, & PORT first,
|
||
then NAME & USER, then NAME & PORT, then just NAME."
|
||
(seq-mapcat
|
||
#'identity
|
||
(list
|
||
(when (and user port)
|
||
(list
|
||
(format "%s@%s%s%s" user name auth-source-pass-port-separator port)
|
||
(format "%s%s%s/%s" name auth-source-pass-port-separator port user)))
|
||
(when user
|
||
(list
|
||
(format "%s@%s" user name)
|
||
(format "%s/%s" name user)))
|
||
(when port
|
||
(list
|
||
(format "%s%s%s" name auth-source-pass-port-separator port)))
|
||
(list
|
||
(format "%s" name)))))
|
||
|
||
(provide 'auth-source-pass)
|
||
;;; auth-source-pass.el ends here
|