From cbf74f6cfac4df318885b15ad034dd761d33a0f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Bidar?= Date: Thu, 8 Aug 2024 17:31:20 +0300 Subject: [PATCH 1/3] Fix secret search with basic auth with a port in url * lisp/url/url-auth.el (url-basic-auth): Fix retrieving of secrets when the url contains a port. Ammending the port to server breaks auth-source-search matching for :host which is redundant as it already specified in :port. --- lisp/url/url-auth.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el index 8f4df780a54..c73047da6b3 100644 --- a/lisp/url/url-auth.el +++ b/lisp/url/url-auth.el @@ -72,8 +72,7 @@ url-basic-auth (pass (url-password href)) (enable-recursive-minibuffers t) ; for url-handler-mode (bug#10298) byserv retval data) - (setq server (format "%s:%d" server port) - file (cond + (setq file (cond (realm realm) ((string= "" file) "/") ((string-match "/$" file) file) @@ -94,6 +93,7 @@ url-basic-auth (url-do-auth-source-search server type :secret) (and (url-interactive-p) (read-passwd "Password: " nil (or pass ""))))) + (setq server (format "%s:%d" server port)) (set url-basic-auth-storage (cons (list server (cons file @@ -129,6 +129,7 @@ url-basic-auth (url-do-auth-source-search server type :secret) (and (url-interactive-p) (read-passwd "Password: "))) + server (format "%s:%d" server port) retval (base64-encode-string (format "%s:%s" user pass) t) byserv (assoc server (symbol-value url-basic-auth-storage))) (setcdr byserv -- 2.45.2