mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-24 07:20:37 +00:00
8903106bb7
* lisp/subr.el (if-let*, when-let*, if-let, when-let): Mark if-let and when-let obsolete (bug#73853 and elsewhere). Move docstring text around so that if-let* and when-let* descriptions no longer refer to if-let and when-let. * etc/NEWS: Announce the change. * admin/admin.el (reminder-for-release-blocking-bugs): * doc/misc/erc.texi (display-buffer): * lisp/ansi-color.el (ansi-color-apply) (ansi-color--face-vec-face): * lisp/ansi-osc.el (ansi-osc-apply-on-region) (ansi-osc-hyperlink): * lisp/arc-mode.el (archive-goto-file) (archive-next-file-displayer): * lisp/auth-source-pass.el (auth-source-pass-search) (auth-source-pass--parse-data) (auth-source-pass--find-match-many): * lisp/autorevert.el (auto-revert-notify-rm-watch): * lisp/buff-menu.el (Buffer-menu-unmark-all-buffers) (Buffer-menu-group-by-root): * lisp/calendar/parse-time.el (parse-iso8601-time-string): * lisp/cedet/pulse.el (pulse-tick): * lisp/comint.el (comint--fontify-input-ppss-flush-indirect) (comint--intersect-regions): * lisp/completion-preview.el (completion-preview--try-table) (completion-preview--capf-wrapper, completion-preview--update): * lisp/cus-edit.el (setopt--set) (custom-dirlocals-maybe-update-cons, custom-dirlocals-validate): * lisp/custom.el (load-theme): * lisp/descr-text.el (describe-char): * lisp/desktop.el (desktop--emacs-pid-running-p): * lisp/dired-x.el (menu): * lisp/dired.el (dired-font-lock-keywords) (dired-insert-directory, dired--insert-disk-space, dired-mode): * lisp/dnd.el (dnd-handle-multiple-urls): * lisp/dom.el (dom-remove-attribute): * lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): * lisp/emacs-lisp/bytecomp.el (bytecomp--custom-declare): * lisp/emacs-lisp/comp-common.el (comp-function-type-spec): * lisp/emacs-lisp/comp-cstr.el (comp--all-classes) (comp-cstr-set-range-for-arithm, comp--cstr-union-1-no-mem) (comp-cstr-intersection-no-mem, comp-cstr-fixnum-p) (comp-cstr-type-p): * lisp/emacs-lisp/comp-run.el (comp-subr-trampoline-install) (native--compile-async): * lisp/emacs-lisp/comp.el (comp--get-function-cstr) (comp--function-pure-p, comp--intern-func-in-ctxt) (comp--addr-to-bb-name, comp--emit-assume, comp--maybe-add-vmvar) (comp--add-call-cstr, comp--compute-dominator-tree) (comp--dom-tree-walker, comp--ssa-rename) (comp--function-call-maybe-fold, comp--fwprop-call) (comp--call-optim-func): * lisp/emacs-lisp/edebug.el (edebug-global-prefix) (edebug-remove-instrumentation): * lisp/emacs-lisp/eieio.el (initialize-instance): * lisp/emacs-lisp/ert-x.el (ert-resource-directory): * lisp/emacs-lisp/ert.el (ert--expand-should-1) (ert-test-location, ert-write-junit-test-report) (ert-test--erts-test): * lisp/emacs-lisp/icons.el (icon-complete-spec, icon-string) (icons--create): * lisp/emacs-lisp/lisp-mode.el (lisp--local-defform-body-p): * lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--make-autoload) (loaddefs-generate--parse-file): * lisp/emacs-lisp/multisession.el (multisession-edit-mode--revert, multisession-edit-value): * lisp/emacs-lisp/package-vc.el (package-vc--read-archive-data) (package-vc--version, package-vc--clone): * lisp/emacs-lisp/package.el (package--reload-previously-loaded): * lisp/emacs-lisp/pp.el (pp--insert-lisp): * lisp/emacs-lisp/subr-x.el (add-display-text-property): * lisp/emacs-lisp/tabulated-list.el (tabulated-list-print): * lisp/emacs-lisp/timer.el (run-at-time): * lisp/emacs-lisp/vtable.el (vtable-goto-table) (vtable-goto-column, vtable-update-object, vtable--insert-line) (vtable--compute-widths, vtable--make-keymap): * lisp/emacs-lisp/warnings.el (display-warning): * lisp/epa-file.el (epa-file-insert-file-contents): * lisp/epa.el (epa-show-key): * lisp/erc/erc-backend.el (erc--split-line, erc--conceal-prompt) (PRIVMSG, erc--get-isupport-entry): * lisp/erc/erc-button.el (erc-button-add-nickname-buttons) (erc--button-next): * lisp/erc/erc-common.el (erc--find-group): * lisp/erc/erc-fill.el (erc-fill, erc-fill-static) (erc-fill--wrap-escape-hidden-speaker) (erc-fill--wrap-unmerge-on-date-stamp) (erc-fill--wrap-massage-initial-message-post-clear) (erc-fill-wrap, erc-fill--wrap-rejigger-region): * lisp/erc/erc-goodies.el (erc--scrolltobottom-all) (erc--keep-place-indicator-on-window-buffer-change) (keep-place-indicator, erc--keep-place-indicator-adjust-on-clear) (erc-keep-place-move, erc--command-indicator-display): * lisp/erc/erc-ibuffer.el (erc-members): * lisp/erc/erc-join.el (erc-join--remove-requested-channel) (erc-autojoin--join): * lisp/erc/erc-networks.el (erc-networks--id-qualifying-init-parts, erc-networks--id-reload) (erc-networks--id-ensure-comparable) (erc-networks--reclaim-orphaned-target-buffers) (erc-networks--server-select): * lisp/erc/erc-nicks.el (erc-nicks-invert) (erc-nicks--redirect-face-widget-link, erc-nicks--highlight) (erc-nicks--highlight-button) (erc-nicks--list-faces-help-button-action, erc-nicks-list-faces) (erc-nicks-refresh, erc-nicks--colors-from-faces) (erc-nicks--track-prioritize) (erc-nicks--remember-face-for-track): * lisp/erc/erc-notify.el (querypoll, erc--querypoll-get-next) (erc--querypoll-on-352, erc--querypoll-send): * lisp/erc/erc-sasl.el (erc-sasl--read-password): * lisp/erc/erc-services.el (erc-services-issue-ghost-and-retry-nick): * lisp/erc/erc-speedbar.el (erc-speedbar--ensure, nickbar) (erc-speedbar-toggle-nicknames-window-lock) (erc-speedbar--compose-nicks-face): * lisp/erc/erc-stamp.el (erc-stamp--recover-on-reconnect) (erc-stamp-prefix-log-filter, erc--conceal-prompt) (erc--insert-timestamp-left, erc-insert-timestamp-right) (erc-stamp--defer-date-insertion-on-post-modify) (erc-insert-timestamp-left-and-right) (erc-stamp--redo-right-stamp-post-clear) (erc-stamp--reset-on-clear, erc-stamp--dedupe-date-stamps): * lisp/erc/erc-status-sidebar.el (bufbar) (erc-status-sidebar-prefer-target-as-name) (erc-status-sidebar-default-allsort, erc-status-sidebar-click): * lisp/erc/erc-track.el (erc-track--shortened-names-get) (erc-track--setup, erc-track--select-mode-line-face) (erc-track-modified-channels, erc-track--collect-faces-in) (erc-track--switch-buffer, erc-track--replace-killed-buffer): * lisp/erc/erc-truncate.el (erc-truncate--setup) (erc-truncate-buffer): * lisp/erc/erc.el (erc--ensure-query-member) (erc--ensure-query-members, erc--remove-channel-users-but) (erc--cusr-change-status, erc--find-mode, erc--update-modules) (erc-log-irc-protocol, erc--refresh-prompt) (erc--restore-important-text-props) (erc--order-text-properties-from-hash, erc-send-input-line) (erc-cmd-IGNORE, erc--unignore-user, erc-cmd-QUERY) (erc-cmd-BANLIST, erc--speakerize-nick) (erc--format-speaker-input-message, erc-channel-receive-names) (erc-send-current-line, erc-format-target-and/or-network) (erc-kill-buffer-function, erc-restore-text-properties) (erc--get-eq-comparable-cmd): * lisp/eshell/em-alias.el (eshell-maybe-replace-by-alias--which) (eshell-maybe-replace-by-alias): * lisp/eshell/em-glob.el (eshell-glob-convert): * lisp/eshell/em-pred.el (eshell-pred-user-or-group) (eshell-pred-file-time, eshell-pred-file-type) (eshell-pred-file-mode, eshell-pred-file-links) (eshell-pred-file-size): * lisp/eshell/em-prompt.el (eshell-forward-paragraph) (eshell-next-prompt): * lisp/eshell/esh-arg.el (eshell-resolve-current-argument): * lisp/eshell/esh-cmd.el (eshell-do-eval, eshell/which) (eshell-plain-command--which, eshell-plain-command): * lisp/eshell/esh-io.el (eshell-duplicate-handles) (eshell-protect-handles, eshell-get-target, eshell-close-target): * lisp/eshell/esh-proc.el (eshell-sentinel): * lisp/eshell/esh-var.el (eshell-parse-variable-ref) (eshell-get-variable, eshell-set-variable): * lisp/faces.el (face-at-point): * lisp/ffap.el (ffap-in-project): * lisp/filenotify.el (file-notify--rm-descriptor): * lisp/files-x.el (read-dir-locals-file) (connection-local-update-profile-variables) (connection-local-value): * lisp/files.el (file-remote-p, abbreviate-file-name) (set-auto-mode, hack-local-variables) (revert-buffer-restore-read-only): * lisp/find-dired.el (find-dired-sort-by-filename): * lisp/font-lock.el (font-lock--filter-keywords): * lisp/gnus/gnus-art.el (article-emojize-symbols): * lisp/gnus/gnus-int.el (gnus-close-server): * lisp/gnus/gnus-search.el (gnus-search-transform) (gnus-search-indexed-parse-output, gnus-search-server-to-engine): * lisp/gnus/gnus-sum.el (gnus-collect-urls, gnus-shorten-url): * lisp/gnus/gnus.el (gnus-check-backend-function): * lisp/gnus/message.el (message-send-mail): * lisp/gnus/mml.el (mml-generate-mime, mml-insert-mime-headers): * lisp/gnus/nnatom.el (nnatom--read-feed, nnatom--read-article) (nnatom--read-article-or-group-authors, nnatom--read-publish) (nnatom--read-update, nnatom--read-links): * lisp/gnus/nnfeed.el (nnfeed--read-server, nnfeed--write-server) (nnfeed--parse-feed, nnfeed--group-data, nnfeed-retrieve-article) (nnfeed-retrieve-headers, nnfeed--print-part) (nnfeed-request-article, nnfeed-request-group) (nnfeed-request-list, nnfeed--group-description) (nnfeed-request-group-description) (nnfeed-request-list-newsgroups, nnfeed-request-rename-group): * lisp/gnus/nnmh.el (nnmh-update-gnus-unreads): * lisp/help-fns.el (help-find-source) (help-fns--insert-menu-bindings, help-fns--mention-first-release) (help-fns--mention-shortdoc-groups) (help-fns--customize-variable-version) (help-fns--face-custom-version-info, describe-mode): * lisp/help-mode.el (help-make-xrefs): * lisp/help.el (help-key-description, help--describe-command): * lisp/hfy-cmap.el (htmlfontify-load-rgb-file): * lisp/ibuf-ext.el (ibuffer-jump-to-filter-group) (ibuffer-kill-filter-group, ibuffer-kill-line) (ibuffer-save-filter-groups, ibuffer-save-filters, filename) (basename, file-extension, ibuffer-diff-buffer-with-file-1) (ibuffer-mark-by-file-name-regexp) (ibuffer-mark-by-content-regexp): * lisp/ibuf-macs.el (ibuffer-aif, ibuffer-awhen): * lisp/ibuffer.el (ibuffer-mouse-toggle-mark) (ibuffer-toggle-marks, ibuffer-mark-interactive) (ibuffer-compile-format, process, ibuffer-map-lines): * lisp/image.el (image--compute-map) (image--compute-original-map): * lisp/image/exif.el (exif-parse-buffer): * lisp/image/image-converter.el (image-convert-p, image-convert) (image-converter--find-converter): * lisp/image/image-dired-util.el (image-dired-file-name-at-point): * lisp/image/image-dired.el (image-dired-track-original-file) (image-dired--on-file-in-dired-buffer) (image-dired--with-thumbnail-buffer) (image-dired-jump-original-dired-buffer) (image-dired--slideshow-step, image-dired-display-image): * lisp/image/wallpaper.el (wallpaper--init-action-kill) (wallpaper--find-setter, wallpaper--find-command) (wallpaper--find-command-args, wallpaper--x-monitor-name): * lisp/info-look.el (info-lookup-interactive-arguments) (info-complete)::(:mode): * lisp/info.el (info-pop-to-buffer, Info-read-node-name-1): * lisp/international/emoji.el (emoji--adjust-displayable-1) (emoji--add-recent): * lisp/jsonrpc.el (jsonrpc--call-deferred) (jsonrpc--process-sentinel, jsonrpc--remove): * lisp/keymap.el (keymap-local-lookup): * lisp/mail/emacsbug.el (report-emacs-bug-hook) (submit-emacs-patch): * lisp/mail/ietf-drums.el (ietf-drums-parse-addresses): * lisp/mail/mailclient.el (mailclient-send-it): * lisp/mail/rfc6068.el (rfc6068-parse-mailto-url): * lisp/mail/undigest.el (rmail-digest-parse-mixed-mime): * lisp/minibuffer.el (completion-metadata-get) (completions--after-change) (minibuffer-visible-completions--filter): * lisp/net/browse-url.el (browse-url-url-at-point) (browse-url-file-url, browse-url-emacs): * lisp/net/dbus.el (dbus-byte-array-to-string) (dbus-monitor-goto-serial): * lisp/net/dictionary.el (dictionary-search): * lisp/net/eww.el (eww--download-directory) (eww-auto-rename-buffer, eww-open-in-new-buffer, eww-submit) (eww-follow-link, eww-read-alternate-url) (eww-copy-alternate-url): * lisp/net/goto-addr.el (goto-address-at-point): * lisp/net/mailcap.el (mailcap-mime-info): * lisp/net/rcirc.el (rcirc, rcirc-connect, rcirc-send-string) (rcirc-kill-buffer-hook, rcirc-print, rcirc-when) (rcirc-color-attributes, rcirc-handler-NICK) (rcirc-handler-TAGMSG, rcirc-handler-BATCH): * lisp/net/shr.el (shr-descend, shr-adaptive-fill-function) (shr-correct-dom-case, shr-tag-a): * lisp/net/sieve.el (sieve-manage-quit): * lisp/outline.el (outline-cycle-buffer): * lisp/pcmpl-git.el (pcmpl-git--tracked-file-predicate): * lisp/proced.el (proced-auto-update-timer): * lisp/progmodes/bug-reference.el (bug-reference-try-setup-from-vc): * lisp/progmodes/c-ts-common.el (c-ts-common--fill-paragraph): * lisp/progmodes/c-ts-mode.el (c-ts-mode--preproc-offset) (c-ts-mode--anchor-prev-sibling, c-ts-mode-indent-defun): * lisp/progmodes/compile.el (compilation-error-properties) (compilation-find-file-1): * lisp/progmodes/eglot.el (eglot--check-object) (eglot--read-server, eglot-upgrade-eglot) (eglot-handle-notification, eglot--CompletionParams) (eglot-completion-at-point, eglot--sig-info) (eglot-register-capability): * lisp/progmodes/elisp-mode.el (emacs-lisp-native-compile-and-load) (elisp-eldoc-var-docstring-with-value): * lisp/progmodes/erts-mode.el (erts-mode--goto-start-of-test): * lisp/progmodes/flymake.el (flymake--update-eol-overlays) (flymake-eldoc-function): * lisp/progmodes/gdb-mi.el (gdb-breakpoints-list-handler-custom) (gdb-frame-handler): * lisp/progmodes/go-ts-mode.el (go-ts-mode-docstring) (go-ts-mode--comment-on-previous-line-p) (go-ts-mode--get-test-regexp-at-point) (go-ts-mode-test-this-file): * lisp/progmodes/grep.el (lgrep, rgrep-default-command) (grep-file-at-point): * lisp/progmodes/perl-mode.el (perl--end-of-format-p): * lisp/progmodes/php-ts-mode.el (php-ts-mode--anchor-prev-sibling, php-ts-mode--indent-defun): * lisp/progmodes/project.el (project--other-place-command) (project--find-default-from, project--transplant-file-name) (project-prefixed-buffer-name, project--remove-from-project-list) (project-prompt-project-name, project-remember-projects-under) (project--switch-project-command) (project-uniquify-dirname-transform, project-mode-line-format): * lisp/progmodes/python.el (python-font-lock-keywords-maximum-decoration) (python--treesit-fontify-union-types) (python-shell-get-process-name, python-shell-restart) (python-shell-completion-at-point, python-ffap-module-path) (python-util-comint-end-of-output-p, python--import-sources) (python-add-import, python-remove-import, python-fix-imports): * lisp/progmodes/xref.el (xref--add-log-current-defun): * lisp/repeat.el (repeat-echo-message-string): * lisp/saveplace.el (save-place-dired-hook): * lisp/server.el (server-save-buffers-kill-terminal): * lisp/shadowfile.el (shadow-make-fullname) (shadow-contract-file-name, shadow-define-literal-group): * lisp/shell.el (shell-highlight-undef-mode): * lisp/simple.el (command-completion-using-modes-p) (command-execute, file-user-uid, file-group-gid) (first-completion, last-completion, switch-to-completions): * lisp/startup.el (startup--load-user-init-file): * lisp/tab-line.el (tab-line-tabs-buffer-group-by-project): * lisp/tar-mode.el (tar-goto-file, tar-next-file-displayer): * lisp/term/android-win.el (android-encode-select-string) (gui-backend-set-selection): * lisp/term/haiku-win.el (haiku-dnd-convert-string) (haiku-select-encode-xstring, haiku-select-encode-utf-8-string): * lisp/textmodes/emacs-news-mode.el (emacs-news--buttonize): * lisp/textmodes/ispell.el (ispell-completion-at-point): * lisp/textmodes/sgml-mode.el (sgml-validate) (html-mode--complete-at-point): * lisp/textmodes/tex-mode.el (tex-recenter-output-buffer) (xref-backend-references): * lisp/thingatpt.el (thing-at-point-file-at-point) (thing-at-point-face-at-point): * lisp/thread.el (thread-list--get-status): * lisp/time.el (world-clock-copy-time-as-kill, world-clock): * lisp/touch-screen.el (touch-screen-handle-touch): * lisp/treesit.el (treesit-language-at, treesit-node-at) (treesit-node-on, treesit-buffer-root-node) (treesit-node-field-name, treesit-local-parsers-at) (treesit-local-parsers-on, treesit--cleanup-local-range-overlays) (treesit-font-lock-recompute-features) (treesit-font-lock-fontify-region, treesit-transpose-sexps) (treesit-add-log-current-defun, treesit-major-mode-setup) (treesit--explorer-refresh, treesit-install-language-grammar): * lisp/url/url.el (url-retrieve-synchronously): * lisp/vc/smerge-mode.el (smerge-diff): * lisp/vc/vc-dir.el (vc-dir): * lisp/vc/vc-dispatcher.el (vc-do-async-command): * lisp/vc/vc-git.el (vc-git-dir--branch-headers) (vc-git-dir--stash-headers, vc-git--log-edit-summary-check) (vc-git-stash-list): * lisp/vc/vc.el (vc-responsible-backend, vc-buffer-sync-fileset) (vc-clone): * lisp/visual-wrap.el (visual-wrap--apply-to-line): * lisp/wid-edit.el (widget-text) (widget-editable-list-insert-before): * lisp/window-tool-bar.el (window-tool-bar--keymap-entry-to-string): * lisp/window.el (display-buffer, display-buffer-full-frame) (window-point-context-set, window-point-context-use) (window-point-context-use-default-function): * lisp/xdg.el (xdg-current-desktop): * lisp/xwidget.el (xwidget-webkit-callback): * lisp/yank-media.el (yank-media--get-selection) (yank-media-types): * test/lisp/comint-tests.el (comint-tests/test-password-function): * test/lisp/completion-preview-tests.el (completion-preview-tests--capf): * test/lisp/cus-edit-tests.el (with-cus-edit-test): * test/lisp/erc/erc-scenarios-base-local-modules.el (-phony-sblm-): * test/lisp/erc/erc-scenarios-stamp.el (erc-scenarios-stamp--on-post-modify): * test/lisp/erc/erc-services-tests.el (erc-services-tests--asp-parse-entry): * test/lisp/erc/erc-tests.el (erc-modules--internal-property) (erc--find-mode, erc-tests--update-modules): * test/lisp/erc/resources/erc-d/erc-d-i.el (erc-d-i--parse-message): * test/lisp/erc/resources/erc-d/erc-d-t.el (erc-d-t-kill-related-buffers, erc-d-t-with-cleanup): * test/lisp/erc/resources/erc-d/erc-d-tests.el (erc-d-i--parse-message--irc-parser-tests): * test/lisp/erc/resources/erc-d/erc-d-u.el (erc-d-u--read-exchange-slowly): * test/lisp/erc/resources/erc-d/erc-d.el (erc-d--expire) (erc-d--finalize-done, erc-d--command-handle-all): * test/lisp/erc/resources/erc-scenarios-common.el (erc-scenarios-common-with-cleanup): * test/lisp/erc/resources/erc-tests-common.el (erc-tests--common-display-message) (erc-tests-common-create-subprocess): * test/lisp/ibuffer-tests.el (ibuffer-test-Bug25058): * test/lisp/international/mule-tests.el (mule-cmds-tests--ucs-names-missing-names): * test/lisp/progmodes/python-tests.el (python-tests-get-shell-interpreter) (python-tests--get-interpreter-info): * test/lisp/progmodes/ruby-ts-mode-tests.el (ruby-ts-resource-file): * test/lisp/replace-tests.el (replace-tests-with-undo): * test/src/emacs-tests.el (emacs-tests--seccomp-debug): * test/src/process-tests.el (process-tests--emacs-command) (process-tests--emacs-binary, process-tests--dump-file): * test/src/treesit-tests.el (treesit--ert-test-defun-navigation): Replace use of the now-obsolete if-let and when-let.
448 lines
19 KiB
EmacsLisp
448 lines
19 KiB
EmacsLisp
;;; auth-source-pass.el --- Integrate auth-source with password-store -*- lexical-binding: t -*-
|
||
|
||
;; Copyright (C) 2015, 2017-2024 Free Software Foundation, Inc.
|
||
|
||
;; Author: Damien Cassou <damien@cassou.me>,
|
||
;; Nicolas Petton <nicolas@petton.fr>
|
||
;; Keith Amidon <camalot@picnicpark.org>
|
||
;; Version: 5.0.0
|
||
;; 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 (https://passwordstore.org/) within
|
||
;; auth-source.
|
||
|
||
;;; Code:
|
||
|
||
(require 'seq)
|
||
(require 'cl-lib)
|
||
(require 'auth-source)
|
||
(require 'url-parse)
|
||
;; Use `eval-when-compile' after the other `require's to avoid spurious
|
||
;; "might not be defined at runtime" warnings.
|
||
(eval-when-compile (require 'subr-x))
|
||
|
||
(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")
|
||
|
||
(defcustom auth-source-pass-extra-query-keywords nil
|
||
"Whether to consider additional keywords when performing a query.
|
||
Specifically, when the value is t, recognize the `:max' and
|
||
`:require' keywords and accept lists of query parameters for
|
||
certain keywords, such as `:host' and `:user'. Beyond that, wrap
|
||
all returned secrets in a function and don't bother considering
|
||
subdomains when matching hosts. Also, forgo any further results
|
||
filtering unless given an applicable `:require' argument. When
|
||
this option is nil, do none of that, and enact the narrowing
|
||
behavior described toward the bottom of the Info node `(auth) The
|
||
Unix password store'."
|
||
:type 'boolean
|
||
:version "29.1")
|
||
|
||
(cl-defun auth-source-pass-search (&rest spec
|
||
&key backend type host user port
|
||
require max
|
||
&allow-other-keys)
|
||
"Given some search query, return matching credentials.
|
||
|
||
See `auth-source-search' for details on the parameters SPEC, BACKEND, TYPE,
|
||
HOST, USER, PORT, REQUIRE, and MAX."
|
||
(cl-assert (or (null type) (eq type (oref backend type)))
|
||
t "Invalid password-store search: %s %s")
|
||
(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)
|
||
(auth-source-pass-extra-query-keywords
|
||
(auth-source-pass--build-result-many host port user require max))
|
||
(t
|
||
(when-let* ((result (auth-source-pass--build-result host port user)))
|
||
(list result)))))
|
||
|
||
(defun auth-source-pass--build-result (hosts port user)
|
||
"Build auth-source-pass entry matching HOSTS, PORT and USER.
|
||
|
||
HOSTS can be a string or a list of strings."
|
||
(let ((entry-data (auth-source-pass--find-match hosts user port)))
|
||
(when entry-data
|
||
(let ((retval (list
|
||
:host (auth-source-pass--get-attr "host" entry-data)
|
||
: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))))
|
||
|
||
(defvar auth-source-pass--match-regexp nil)
|
||
|
||
(defun auth-source-pass--match-regexp (s)
|
||
(rx-to-string ; autoloaded
|
||
`(: (or bot "/")
|
||
(or (: (? (group-n 20 (+ (not (in ?/ ,s)))) "@") ; user prefix
|
||
(group-n 10 (+ (not (in ?/ ?@ ,s)))) ; host
|
||
(? ,s (group-n 30 (+ (not (in ?\s ?/ ,s)))))) ; port
|
||
(: (group-n 11 (+ (not (in ?/ ?@ ,s)))) ; host
|
||
(? ,s (group-n 31 (+ (not (in ?\s ?/ ,s))))) ; port
|
||
(? "/" (group-n 21 (+ (not (in ?/ ,s))))))) ; user suffix
|
||
eot)
|
||
'no-group))
|
||
|
||
(defun auth-source-pass--build-result-many (hosts ports users require max)
|
||
"Return multiple `auth-source-pass--build-result' values."
|
||
(setq hosts (ensure-list hosts))
|
||
(setq users (ensure-list users))
|
||
(setq ports (ensure-list ports))
|
||
(let* ((auth-source-pass--match-regexp (auth-source-pass--match-regexp
|
||
auth-source-pass-port-separator))
|
||
(rv (auth-source-pass--find-match-many hosts users ports
|
||
require (or max 1))))
|
||
(when auth-source-debug
|
||
(auth-source-pass--do-debug "final result: %S" rv))
|
||
(let (out)
|
||
(dolist (e rv out)
|
||
(when-let* ((s (plist-get e :secret)) ; not captured by closure in 29.1
|
||
(v (auth-source--obfuscate s)))
|
||
(setf (plist-get e :secret)
|
||
(lambda () (auth-source--deobfuscate v))))
|
||
(push e out)))))
|
||
|
||
;;;###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 URL `https://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 (cdr (split-string contents "\n" t "[ \t]+"))))
|
||
(seq-remove #'null
|
||
(mapcar (lambda (line)
|
||
(when-let* ((pos (seq-position line ?:)))
|
||
(cons (string-trim (substring line 0 pos))
|
||
(string-trim (substring line (1+ pos))))))
|
||
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 (hosts user port)
|
||
"Return password-store entry data matching HOSTS, USER and PORT.
|
||
|
||
Disambiguate between user provided inside HOSTS (e.g., user@server.com) and
|
||
inside USER by giving priority to USER. Same for PORT.
|
||
HOSTS can be a string or a list of strings."
|
||
(seq-some (lambda (host)
|
||
(let ((entry (apply #'auth-source-pass--find-match-unambiguous
|
||
(auth-source-pass--disambiguate host user port))))
|
||
(if (or (null entry) (assoc "host" entry))
|
||
entry
|
||
(cons (cons "host" host) entry))))
|
||
(if (listp hosts)
|
||
hosts
|
||
(list hosts))))
|
||
|
||
(defun auth-source-pass--retrieve-parsed (seen path port-number-p)
|
||
(when (string-match auth-source-pass--match-regexp path)
|
||
(puthash path
|
||
`( :host ,(or (match-string 10 path) (match-string 11 path))
|
||
,@(if-let* ((tr (match-string 21 path)))
|
||
(list :user tr :suffix t)
|
||
(list :user (match-string 20 path)))
|
||
:port ,(and-let* ((p (or (match-string 30 path)
|
||
(match-string 31 path)))
|
||
(n (string-to-number p)))
|
||
(if (or (zerop n) (not port-number-p))
|
||
(format "%s" p)
|
||
n)))
|
||
seen)))
|
||
|
||
(defun auth-source-pass--match-parts (cache key reference require)
|
||
(let ((value (plist-get cache key)))
|
||
(cond ((memq key require)
|
||
(if reference (equal value reference) value))
|
||
((and value reference) (equal value reference))
|
||
(t))))
|
||
|
||
(defun auth-source-pass--find-match-many (hosts users ports require max)
|
||
"Return plists for valid combinations of HOSTS, USERS, PORTS."
|
||
(let ((seen (make-hash-table :test #'equal))
|
||
(entries (auth-source-pass-entries))
|
||
out suffixed suffixedp)
|
||
(catch 'done
|
||
(dolist (host hosts out)
|
||
(pcase-let ((`(,_ ,u ,p) (auth-source-pass--disambiguate host)))
|
||
(unless (or (not (equal "443" p)) (string-prefix-p "https://" host))
|
||
(setq p nil))
|
||
(dolist (user (or users (list u)))
|
||
(dolist (port (or ports (list p)))
|
||
(dolist (e entries)
|
||
(when-let*
|
||
((m (or (gethash e seen) (auth-source-pass--retrieve-parsed
|
||
seen e (integerp port))))
|
||
((equal host (plist-get m :host)))
|
||
((auth-source-pass--match-parts m :port port require))
|
||
((auth-source-pass--match-parts m :user user require))
|
||
;; For now, ignore body-content pairs, if any,
|
||
;; from `auth-source-pass--parse-data'.
|
||
(secret (let ((parsed (auth-source-pass-parse-entry e)))
|
||
(or (auth-source-pass--get-attr 'secret parsed)
|
||
(not (memq :secret require))))))
|
||
(push
|
||
`( :host ,host ; prefer user-provided :host over h
|
||
,@(and-let* ((u (plist-get m :user))) (list :user u))
|
||
,@(and-let* ((p (plist-get m :port))) (list :port p))
|
||
,@(and secret (not (eq secret t)) (list :secret secret)))
|
||
(if (setq suffixedp (plist-get m :suffix)) suffixed out))
|
||
(unless suffixedp
|
||
(when (or (zerop (cl-decf max))
|
||
(null (setq entries (delete e entries))))
|
||
(throw 'done out)))))
|
||
(setq suffixed (nreverse suffixed))
|
||
(while suffixed
|
||
(push (pop suffixed) out)
|
||
(when (zerop (cl-decf max))
|
||
(throw 'done out))))))))))
|
||
|
||
(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 filename 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)))))
|
||
|
||
(defun auth-source-pass-file-name-p (file)
|
||
"Say whether FILE is used by `auth-source-pass'."
|
||
(and (stringp file) (stringp auth-source-pass-filename)
|
||
(string-equal
|
||
(expand-file-name file) (expand-file-name auth-source-pass-filename))))
|
||
|
||
(with-eval-after-load 'bookmark
|
||
(add-hook 'bookmark-inhibit-context-functions
|
||
#'auth-source-pass-file-name-p))
|
||
|
||
(provide 'auth-source-pass)
|
||
;;; auth-source-pass.el ends here
|
||
|
||
;; LocalWords: backend hostname
|