From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 23 Nov 2024 11:49:56 +0000 (+0100)
Subject: Improve robustness of auth-source-pass.el
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a801f250ec5adae090250814f48760d83c052706;p=emacs.git

Improve robustness of auth-source-pass.el

* lisp/auth-source-pass.el (auth-source-pass--read-entry):
Ensure, that `epa-file-handler' is active.  (Bug#67937)

(cherry picked from commit 1b33c00f4c28d730b17293f94ce5325f7e916bc8)
---

diff --git a/lisp/auth-source-pass.el b/lisp/auth-source-pass.el
index dd93d414d5e..383325a7cfa 100644
--- a/lisp/auth-source-pass.el
+++ b/lisp/auth-source-pass.el
@@ -195,10 +195,15 @@ See `auth-source-pass-get'."
 (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))))
+    ;; `file-name-handler-alist' could be nil, or miss the
+    ;; `epa-file-handler' entry.  We ensure, that it does exist.
+    ;; (Bug#67937)
+    (let ((file-name-handler-alist
+           (cons epa-file-handler file-name-handler-alist)))
+      (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.