url-http-ntlm: Override url-http-parse-headers redirect handling

[gnu-emacs-elpa] / packages / url-http-ntlm / url-http-ntlm.el

diff --git a/packages/url-http-ntlm/url-http-ntlm.el b/packages/url-http-ntlm/url-http-ntlm.el
index 4750ae1c184c617b2a9b1d9630e97ce6f3652d7c..362f2ccb59780056e9bafdf27f1839162e148bf9 100644 (file)
--- a/packages/url-http-ntlm/url-http-ntlm.el
+++ b/packages/url-http-ntlm/url-http-ntlm.el
@@ -40,9 +40,18 @@
 (require 'url-auth)
 (require 'url-http)
 (require 'mail-parse)
-(require 'cl)
+(require 'cl-lib)
 (require 'ntlm)
 
+;; Remove authorization after redirect.
+(when (and (boundp 'emacs-major-version)
+          (< emacs-major-version 25))
+  (require (intern (format "url-http-ntlm-parse-headers-%d.%d"
+                          emacs-major-version
+                          emacs-minor-version))))
+
+\f
+;;; Private variables.
 (defvar url-http-ntlm--auth-storage nil
   "Authentication storage.
 An alist that maps a server name to a pair of \(<username> <ntlm
@@ -58,12 +67,14 @@ Note that for any server, only one user and password is ever stored.")
 This is used to detect multiple calls.")
 (make-variable-buffer-local 'url-http-ntlm--last-args)
 
+\f
+;;; Private functions.
 (defun url-http-ntlm--ensure-keepalive ()
   "Report an error if `url-http-attempt-keepalives' is not set."
-  (assert url-http-attempt-keepalives
-         nil
-         (concat "NTLM authentication won't work unless"
-                 " `url-http-attempt-keepalives' is set!")))
+  (cl-assert url-http-attempt-keepalives
+            nil
+            (concat "NTLM authentication won't work unless"
+                    " `url-http-attempt-keepalives' is set!")))
 
 (defun url-http-ntlm--clean-headers ()
   "Remove Authorization element from `url-http-extra-headers' alist."
@@ -95,7 +106,7 @@ response's \"WWW-Authenticate\" header, munged by
                                                   (cdr auth-header)))
                    :error)
                   ((and (= (length args) 2)
-                        (destructuring-bind (challenge ntlm) args
+                        (cl-destructuring-bind (challenge ntlm) args
                           (and (string-equal "ntlm" (car ntlm))
                                (string-match challenge-rxp
                                              (car challenge)))))
@@ -133,7 +144,7 @@ stored."
          nil)
       ;; get
       (if (or both
-             (and stored user (not (equal user (second stored))))
+             (and stored user (not (equal user (cl-second stored))))
              (not stored))
          (let* ((user* (if both
                            user
@@ -163,12 +174,14 @@ stored."
 
 (defun url-http-ntlm--rmssoc (key alist)
   "Remove all elements whose `car' match KEY from ALIST."
-  (remove* key alist :key 'car :test 'equal))
+  (cl-remove key alist :key 'car :test 'equal))
 
 (defun url-http-ntlm--string (data)
   "Return DATA encoded as an NTLM string."
   (concat "NTLM " (base64-encode-string data :nobreak)))
 
+\f
+;;; Public function called by `url-get-authentication'.
 (defun url-ntlm-auth (url &optional prompt overwrite realm args)
   "Return an NTLM HTTP authorization header.
 Get the contents of the Authorization header for a HTTP response
@@ -184,10 +197,10 @@ the server's last response.  These are used by
 `url-http-get-stage' to determine what stage we are at."
   (url-http-ntlm--ensure-keepalive)
   (let ((stage (url-http-ntlm--get-stage args)))
-    (case stage
+    (cl-case stage
       ;; NTLM Type 1 message: the request
       (:request
-       (destructuring-bind (&optional server user hash)
+       (cl-destructuring-bind (&optional server user hash)
           (url-http-ntlm--authorisation url)
         (when server
           (url-http-ntlm--string
@@ -195,7 +208,7 @@ the server's last response.  These are used by
       ;; NTLM Type 3 message: the response
       (:response
        (let ((challenge (url-http-ntlm--get-challenge)))
-        (destructuring-bind (server user hash)
+        (cl-destructuring-bind (server user hash)
             (url-http-ntlm--authorisation url)
           (url-http-ntlm--string
            (ntlm-build-auth-response challenge
@@ -204,6 +217,8 @@ the server's last response.  These are used by
       (:error
        (url-http-ntlm--authorisation url :clear)))))
 
+\f
+;;; Register `url-ntlm-auth' HTTP authentication method.
 (url-register-auth-scheme "ntlm" nil 8)
 
 (provide 'url-http-ntlm)