Package: emacs;
Reported by: Jonas Bernoulli <jonas <at> bernoul.li>
Date: Fri, 10 Sep 2021 16:16:01 UTC
Severity: normal
Tags: patch
Found in version 27.2
Fixed in version 28.1
Done: Lars Ingebrigtsen <larsi <at> gnus.org>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: Jonas Bernoulli <jonas <at> bernoul.li> To: 50511 <at> debbugs.gnu.org Subject: bug#50511: [PATCH] No longer raise error when authentication failed Date: Thu, 16 Sep 2021 20:32:11 +0200
* lisp/url/url-http.el (url-http-handle-authentication): Return t
instead of raising an error, instructing the caller to invoke the
request specific error handler (bug#50511).
---
lisp/url/url-http.el | 94 ++++++++++++++++++++++----------------------
1 file changed, 47 insertions(+), 47 deletions(-)
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index ba13a17a8f..1530016397 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -462,53 +462,53 @@ url-http-handle-authentication
;; credentials to the server, and they were wrong, so just give
;; up.
(let ((authorization (assoc "Authorization" url-http-extra-headers)))
- (when (and authorization
- (not (string-match "^NTLM " (cdr authorization))))
- (error "Wrong authorization used for %s" url)))
-
- ;; find strongest supported auth
- (dolist (this-auth auths)
- (setq this-auth (url-eat-trailing-space
- (url-strip-leading-spaces
- this-auth)))
- (let* ((this-type
- (downcase (if (string-match "[ \t]" this-auth)
- (substring this-auth 0 (match-beginning 0))
- this-auth)))
- (registered (url-auth-registered this-type))
- (this-strength (cddr registered)))
- (when (and registered (> this-strength strength))
- (setq auth this-auth
- type this-type
- strength this-strength))))
-
- (if (not (url-auth-registered type))
- (progn
- (widen)
- (goto-char (point-max))
- (insert "<hr>Sorry, but I do not know how to handle " (or type auth url "")
- " authentication. If you'd like to write it,"
- " please use M-x report-emacs-bug RET.<hr>")
- ;; We used to set a `status' var (declared "special") but I can't
- ;; find the corresponding let-binding, so it's probably an error.
- ;; FIXME: Maybe it was supposed to set `success', i.e. to return t?
- ;; (setq status t)
- nil) ;; Not success yet.
-
- (let* ((args (url-parse-args (subst-char-in-string ?, ?\; auth)))
- (auth (url-get-authentication auth-url
- (cdr-safe (assoc "realm" args))
- type t args)))
- (if (not auth)
- t ;Success.
- (push (cons (if proxy "Proxy-Authorization" "Authorization") auth)
- url-http-extra-headers)
- (let ((url-request-method url-http-method)
- (url-request-data url-http-data)
- (url-request-extra-headers url-http-extra-headers))
- (url-retrieve-internal url url-callback-function
- url-callback-arguments))
- nil))))) ;; Not success yet.
+ (if (and authorization
+ (not (string-match "^NTLM " (cdr authorization)))) ;Bug#43566
+ t ;; Instruct caller to signal an error. Bug#50511
+ ;; Find strongest supported auth.
+ (dolist (this-auth auths)
+ (setq this-auth (url-eat-trailing-space
+ (url-strip-leading-spaces
+ this-auth)))
+ (let* ((this-type
+ (downcase (if (string-match "[ \t]" this-auth)
+ (substring this-auth 0 (match-beginning 0))
+ this-auth)))
+ (registered (url-auth-registered this-type))
+ (this-strength (cddr registered)))
+ (when (and registered (> this-strength strength))
+ (setq auth this-auth
+ type this-type
+ strength this-strength))))
+
+ (if (not (url-auth-registered type))
+ (progn
+ (widen)
+ (goto-char (point-max))
+ (insert "<hr>Sorry, but I do not know how to handle "
+ (or type auth url "")
+ " authentication. If you'd like to write it,"
+ " please use M-x report-emacs-bug RET.<hr>")
+ ;; We used to set a `status' var (declared "special") but I can't
+ ;; find the corresponding let-binding, so it's probably an error.
+ ;; FIXME: Maybe it was supposed to set `success', i.e. to return t?
+ ;; (setq status t)
+ nil) ;; Not success yet.
+
+ (let* ((args (url-parse-args (subst-char-in-string ?, ?\; auth)))
+ (auth (url-get-authentication auth-url
+ (cdr-safe (assoc "realm" args))
+ type t args)))
+ (if (not auth)
+ t ;Success.
+ (push (cons (if proxy "Proxy-Authorization" "Authorization") auth)
+ url-http-extra-headers)
+ (let ((url-request-method url-http-method)
+ (url-request-data url-http-data)
+ (url-request-extra-headers url-http-extra-headers))
+ (url-retrieve-internal url url-callback-function
+ url-callback-arguments))
+ nil))))))) ;; Not success yet.
(defun url-http-parse-response ()
"Parse just the response code."
--
2.33.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.