From f13a4afde747756c4c02fadf49ea6c617cfd42c6 Mon Sep 17 00:00:00 2001 From: Dario Gjorgjevski Date: Thu, 21 Nov 2019 13:51:55 +0100 Subject: [PATCH] Hide quoted passwords with spaces in Authinfo * lisp/auth-source.el (auth-source-netrc-looking-at-one): New function, extracted from auth-source-netrc-parse-one. (auth-source-netrc-parse-one, authinfo--hide-passwords): Use auth-source-netrc-looking-at-one (bug#38311). --- lisp/auth-source.el | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lisp/auth-source.el b/lisp/auth-source.el index 4926f67f0a1..89a468570ac 100644 --- a/lisp/auth-source.el +++ b/lisp/auth-source.el @@ -1000,13 +1000,18 @@ Note that the MAX parameter is used so we can exit the parse early." (forward-line 1) (skip-chars-forward "\t "))) +(defun auth-source-netrc-looking-at-token () + "Say whether the next think in the buffer is a token (password, etc). +Match data is altered to reflect the token." + (or (looking-at "'\\([^']*\\)'") + (looking-at "\"\\([^\"]*\\)\"") + (looking-at "\\([^ \t\n]+\\)"))) + (defun auth-source-netrc-parse-one () "Read one thing from the current buffer." (auth-source-netrc-parse-next-interesting) - (when (or (looking-at "'\\([^']*\\)'") - (looking-at "\"\\([^\"]*\\)\"") - (looking-at "\\([^ \t\n]+\\)")) + (when (auth-source-netrc-looking-at-token) (forward-char (length (match-string 0))) (prog1 (match-string-no-properties 1) @@ -2427,7 +2432,7 @@ passwords are revealed when point moved into the password. (while (re-search-forward (format "\\(\\s-\\|^\\)\\(%s\\)\\s-+" authinfo-hidden) nil t) - (when (looking-at "[^\n\t ]+") + (when (auth-source-netrc-looking-at-token) (let ((overlay (make-overlay (match-beginning 0) (match-end 0)))) (overlay-put overlay 'display (propertize "****" 'face 'warning)) -- 2.39.5