[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 0799c67 05/32: url-http-ntlm: Fix checkdoc errors
From: |
Thomas Fitzsimmons |
Subject: |
[elpa] master 0799c67 05/32: url-http-ntlm: Fix checkdoc errors |
Date: |
Thu, 18 Feb 2016 03:26:56 +0000 |
branch: master
commit 0799c6768fc8508f0b1465991af2e175cf2f403e
Author: Thomas Fitzsimmons <address@hidden>
Commit: Thomas Fitzsimmons <address@hidden>
url-http-ntlm: Fix checkdoc errors
* url-http-ntlm.el (url-http-ntlm-auth-storage, url-ntlm-auth)
(url-ntlm-ensure-keepalive, url-ntlm-clean-headers)
(url-ntlm-get-stage, url-http-ntlm-authorisation)
(url-http-ntlm-get-challenge, url-http-ntlm-rmssoc)
(url-http-ntlm-string): Fix checkdoc errors.
---
packages/url-http-ntlm/url-http-ntlm.el | 45 +++++++++++++++++-------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/packages/url-http-ntlm/url-http-ntlm.el
b/packages/url-http-ntlm/url-http-ntlm.el
index 1e4e7bc..6981921 100644
--- a/packages/url-http-ntlm/url-http-ntlm.el
+++ b/packages/url-http-ntlm/url-http-ntlm.el
@@ -48,8 +48,9 @@
(require 'ntlm)
(defvar url-http-ntlm-auth-storage nil
- "Authentication storage. An alist that maps a server name
-to a pair of \(<username> <ntlm hashes>\).
+ "Authentication storage.
+An alist that maps a server name to a pair of \(<username> <ntlm
+hashes>\).
The hashes are built using `ntlm-get-password-hashes'.
The username can contain the domain name, in the form \"address@hidden".
@@ -57,18 +58,18 @@ The username can contain the domain name, in the form
\"address@hidden".
Note that for any server, only one user and password is ever stored.")
(defun url-ntlm-auth (url &optional prompt overwrite realm args)
- "Get the contents of the Authorization header for a HTTP
- response using NTLM authentication, to access URL. Because
- NTLM is a two-step process, this function expects to be called
- twice, first to generate the NTLM type 1 message (request),
- then to respond to the server's type 2 message (challenge) with
- a suitable response.
-
- PROMPT, OVERWRITE, and REALM are ignored.
-
- ARGS is expected to contain the WWW-Authentication header from
- the server's last response. These are used by
- `url-http-get-stage' to determine what stage we are at."
+ "Return an NTLM HTTP authorization header.
+Get the contents of the Authorization header for a HTTP response
+using NTLM authentication, to access URL. Because NTLM is a
+two-step process, this function expects to be called twice, first
+to generate the NTLM type 1 message (request), then to respond to
+the server's type 2 message (challenge) with a suitable response.
+
+PROMPT, OVERWRITE, and REALM are ignored.
+
+ARGS is expected to contain the WWW-Authentication header from
+the server's last response. These are used by
+`url-http-get-stage' to determine what stage we are at."
(url-ntlm-ensure-keepalive)
(let ((stage (url-ntlm-get-stage args)))
(case stage
@@ -92,12 +93,14 @@ Note that for any server, only one user and password is
ever stored.")
(url-http-ntlm-authorisation url :clear)))))
(defun url-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!")))
(defun url-ntlm-clean-headers ()
+ "Remove Authorization element from `url-http-extra-headers' alist."
(setq url-http-extra-headers
(url-http-ntlm-rmssoc "Authorization" url-http-extra-headers)))
@@ -109,7 +112,7 @@ This is used to detect multiple calls.")
(defun url-ntlm-get-stage (args)
"Determine what stage of the NTLM handshake we are at.
PROMPT and ARGS come from `url-ntlm-auth''s caller,
-`url-get-authentication'. Their meaning depends on the current
+`url-get-authentication'. Their meaning depends on the current
implementation - this function is well and truly coupled.
url-get-authentication' calls `url-ntlm-auth' once when checking
@@ -144,9 +147,10 @@ response's \"WWW-Authenticate\" header, munged by
stage))))
(defun url-http-ntlm-authorisation (url &optional clear)
- "Get or clear NTLM authentication details for URL. If CLEAR is
- non-nil, clear any saved credentials for server. Otherwise,
- return the credentials, prompting the user if necessary.
+ "Get or clear NTLM authentication details for URL.
+If CLEAR is non-nil, clear any saved credentials for server.
+Otherwise, return the credentials, prompting the user if
+necessary.
If URL contains a username and a password, they are used and
stored credentials are not affected.
@@ -190,8 +194,7 @@ stored."
stored))))
(defun url-http-ntlm-get-challenge ()
- "Return the NTLM Type-2 message in the WWW-Authenticate header,
-if it is there."
+ "Return the NTLM Type-2 message in the WWW-Authenticate header, if present."
(save-restriction
(mail-narrow-to-head)
(let ((www-authenticate (mail-fetch-field "www-authenticate")))
@@ -200,9 +203,11 @@ if it is there."
(base64-decode-string (match-string 1 www-authenticate))))))
(defun url-http-ntlm-rmssoc (key alist)
+ "Remove all elements whose `car' match KEY from ALIST."
(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)))
(url-register-auth-scheme "ntlm" nil 8)
- [elpa] master updated (1fc71ba -> 6682a04), Thomas Fitzsimmons, 2016/02/17
- [elpa] master ecee87e 01/32: url-http-ntlm: New package, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 087d353 02/32: url-http-ntlm: Remove trailing whitespace, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 0bbbe59 03/32: url-http-ntlm.el: Adjust blank lines, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 9e52a39 04/32: url-http-ntlm: Wrap lines at column 80, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 0799c67 05/32: url-http-ntlm: Fix checkdoc errors,
Thomas Fitzsimmons <=
- [elpa] master 8482b90 06/32: url-http-ntlm: Remove blank comment lines, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 50656c4 07/32: url-http-ntlm.el: Reindent whole file, Thomas Fitzsimmons, 2016/02/17
- [elpa] master cec4982 08/32: url-http-ntlm.el: Update copyright owner and years, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 2d39d5d 09/32: url-http-ntlm.el: Add maintainer header, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 3033c48 10/32: url-http-ntlm.el: Update installation instructions, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 19e93aa 11/32: url-http-ntlm.el: Update author's email address, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 6fb3a70 12/32: url-http-ntlm: Use url-http-ntlm namespace consistently, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 4128f4f 13/32: url-http-ntlm.el (url-ntlm-auth): Move defun near end of file, Thomas Fitzsimmons, 2016/02/17
- [elpa] master 55e7f42 14/32: url-http-ntlm.el (url-http-ntlm-last-args): Group defvar with others, Thomas Fitzsimmons, 2016/02/17
- [elpa] master d251ed3 15/32: url-http-ntlm: Use double dash naming convention for private symbols, Thomas Fitzsimmons, 2016/02/17