From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Jarno Malmari Newsgroups: gmane.emacs.devel Subject: [PATCH 2/2] Initial implementation for HTTP Digest qop for url Date: Sun, 13 Nov 2016 13:36:21 +0200 Message-ID: <1479036981-22047-3-git-send-email-jarno@malmari.fi> References: <1478988194-7761-1-git-send-email-jarno@malmari.fi> <1479036981-22047-1-git-send-email-jarno@malmari.fi> NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1479037102 7614 195.159.176.226 (13 Nov 2016 11:38:22 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 13 Nov 2016 11:38:22 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 13 12:38:17 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c5t6n-0007xX-PJ for ged-emacs-devel@m.gmane.org; Sun, 13 Nov 2016 12:38:01 +0100 Original-Received: from localhost ([::1]:33285 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c5t6q-0006Sk-T6 for ged-emacs-devel@m.gmane.org; Sun, 13 Nov 2016 06:38:04 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c5t5S-00068P-Fw for emacs-devel@gnu.org; Sun, 13 Nov 2016 06:36:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c5t5Q-0001CV-TZ for emacs-devel@gnu.org; Sun, 13 Nov 2016 06:36:38 -0500 Original-Received: from out4-smtp.messagingengine.com ([66.111.4.28]:54450) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c5t5Q-0001CL-Pl for emacs-devel@gnu.org; Sun, 13 Nov 2016 06:36:36 -0500 Original-Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 5288D204AB for ; Sun, 13 Nov 2016 06:36:36 -0500 (EST) Original-Received: from frontend1 ([10.202.2.160]) by compute1.internal (MEProxy); Sun, 13 Nov 2016 06:36:36 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=malmari.fi; h=date :from:in-reply-to:message-id:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=fA2zdZQYHpJ7cxb juTd+wvFaWOg=; b=YBUv5S1F93ZXXUL56+lMI00Pokr8cLpu/IFvn68UhR1nQ16 6p4fLjTZS9foY7WFdORgbl1rmm9sFpg0bylRKnnykV0ej1xO3oduSaZskhsTEiFk 9lYrhC+eRNPDgsJfDixCOLb+uai1ZE2oFBQXOwm0+piVdsfvDFsh0Upzz+EQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=smtpout; bh=fA2zdZQYHpJ7cxbjuTd+wvFaWOg=; b=lQRt6 c9EAbmOkfJk8rpzw0cHV5RynEZYKm5U2Uw40IaKiyfzXI9x36Qo2RWpO9GCru7LU OHXZ8GuF+meHUwxsddTrAGHmWgQf+ky6IszrrIvpKNFOMaa61og7954lWFJkCA3d ubAikRar6EiibevkXvgK5sSvd0GUnVOkk2uTCY= X-ME-Sender: X-Sasl-enc: eCPC1b6KiJUTZPHP+X6JSIH03QOap5Q0rB9EVVKtn7/e 1479036994 Original-Received: from vabi.peto.intranet (a88-113-156-118.elisa-laajakaista.fi [88.113.156.118]) by mail.messagingengine.com (Postfix) with ESMTPA id 6E1337F07B for ; Sun, 13 Nov 2016 06:36:34 -0500 (EST) X-Mailer: git-send-email 2.7.0.25.gfc10eb5 In-Reply-To: <1479036981-22047-1-git-send-email-jarno@malmari.fi> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.28 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:209370 Archived-At: Some servers have dropped backward compatibility with HTTP Digest Authentication without "qop". The Quality Of Protection scheme is partially implemented: only one supported qop (qop=auth), only one supported algorithm (md5), nonce count remains always as 1 (no replays) * lisp/url/url-auth.el (url-digest-auth-build-response): Hook up new functionality, or fall back to previous. (url-digest-auth-make-request-digest-qop, url-digest-auth-make-cnonce, url-digest-auth-nonce-count, url-digest-auth-name-value-string): Add new helper functions. * test/lisp/url/url-auth-tests.el (url-auth-test-digest-request-digest, url-auth-test-challenges): Test the new implementation. Parts of these were accidentally already merged in the past. --- lisp/url/url-auth.el | 59 ++++++++++++++++++++++++++++++++++++----- test/lisp/url/url-auth-tests.el | 31 +++++++++++++--------- 2 files changed, 72 insertions(+), 18 deletions(-) diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el index 52b2244..a48e511 100644 --- a/lisp/url/url-auth.el +++ b/lisp/url/url-auth.el @@ -131,8 +131,8 @@ url-basic-auth ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Digest authorization code ;;; ------------------------ -;;; This implements the DIGEST authorization type. See the internet draft -;;; ftp://ds.internic.net/internet-drafts/draft-ietf-http-digest-aa-01.txt +;;; This implements the DIGEST authorization type. See RFC 2617 +;;; https://www.ietf.org/rfc/rfc2617.txt ;;; for the complete documentation on this type. ;;; ;;; This is very secure @@ -167,6 +167,15 @@ url-digest-auth-make-request-digest Inputs for this are the hash strings HA1, HA2, and NONCE." (url-digest-auth-kd (url-digest-auth-colonjoin nonce ha2) ha1)) +(defsubst url-digest-auth-make-request-digest-qop (qop ha1 ha2 nonce nc cnonce) + "Construct the request-digest with qop as described in RFC 2617. +QOP describes the \"quality of protection\" and algorithm to use. +HA1, HA2, and NONCE, NC, and CNONCE are string values, described +in RFC 2617. It's worth noting that HA2 already depends on value +of QOP." + (url-digest-auth-kd (url-digest-auth-colonjoin + nonce nc cnonce qop ha2) ha1)) + (defsubst url-digest-auth-directory-id (url realm) "Make an identifier to use for server keys. The identifier is made either from URL's path or REALM." @@ -177,6 +186,21 @@ url-digest-auth-server-id The identifier is made from URL's host and port." (format "%s:%d" (url-host url) (url-port url))) +(defun url-digest-auth-make-cnonce () + "Compute a new unique client nonce value." + (base64-encode-string + (apply 'format "%016x%04x%04x%05x%05x" (random) (current-time)) t)) + +(defun url-digest-auth-nonce-count (nonce) + "The number requests sent to server with the given NONCE. +This count includes the request we're preparing here. + +Currently, this is not implemented and will always return 1. + +Value returned is in string format with leading zeroes, such as +\"00000001\"." + (format "%08x" 1)) + (defun url-digest-auth-name-value-string (pairs) "Concatenate name-value pairs in association list PAIRS. @@ -281,12 +305,20 @@ url-digest-auth-build-response and contents of alist ATTRS. ATTRS is expected to contain at least the server's \"nonce\" -value. It also might contain the optional \"opaque\" value." +value. It also might contain the optional \"opaque\" value. +Newer implementations conforming to RFC 2617 should also contain +qop (Quality Of Protection) and related attributes. + +Restrictions on Quality of Protection scheme: The qop value +\"auth-int\" or algorithm any other than \"MD5\" are not +implemented." + (when key (let ((user (nth 1 key)) (ha1 (nth 2 key)) (ha2 (nth 3 key)) (digest-uri (url-filename url)) + (qop (cdr-safe (assoc "qop" attrs))) (nonce (cdr-safe (assoc "nonce" attrs))) (opaque (cdr-safe (assoc "opaque" attrs)))) @@ -296,9 +328,24 @@ url-digest-auth-build-response (append (list (cons 'username user) (cons 'realm realm) (cons 'nonce nonce) - (cons 'uri digest-uri) - (cons 'response (url-digest-auth-make-request-digest - ha1 ha2 nonce))) + (cons 'uri digest-uri)) + + (cond + ((null qop) + (list (cons 'response (url-digest-auth-make-request-digest + ha1 ha2 nonce)))) + ((string= qop "auth") + (let ((nc (url-digest-auth-nonce-count nonce)) + (cnonce (url-digest-auth-make-cnonce))) + (list (cons 'qop qop) + (cons 'nc nc) + (cons 'cnonce cnonce) + (cons 'response + (url-digest-auth-make-request-digest-qop + qop ha1 ha2 nonce nc cnonce))))) + (t (message "Quality of protection \"%s\" is not implemented." qop) + nil)) + (if opaque (list (cons 'opaque opaque))))))))) diff --git a/test/lisp/url/url-auth-tests.el b/test/lisp/url/url-auth-tests.el index 3d3132b..58f60c4 100644 --- a/test/lisp/url/url-auth-tests.el +++ b/test/lisp/url/url-auth-tests.el @@ -104,14 +104,23 @@ url-auth-test-challenges (plist-get row :expected-ha2))))) (ert-deftest url-auth-test-digest-request-digest () - "Check digest response value when not supporting `qop'." + "Check digest response value." (dolist (row url-auth-test-challenges) - (should (string= (url-digest-auth-make-request-digest - ;; HA1 and HA2 already tested - (plist-get row :expected-ha1) - (plist-get row :expected-ha2) - (plist-get row :nonce)) - (plist-get row :expected-response))))) + (should (string= (plist-get row :expected-response) + (if (plist-member row :qop) + (url-digest-auth-make-request-digest-qop + (plist-get row :qop) + ;; HA1 and HA2 already tested + (plist-get row :expected-ha1) + (plist-get row :expected-ha2) + (plist-get row :nonce) + (plist-get row :nc) + (plist-get row :cnonce)) + (url-digest-auth-make-request-digest + ;; HA1 and HA2 already tested + (plist-get row :expected-ha1) + (plist-get row :expected-ha2) + (plist-get row :nonce))))))) (ert-deftest url-auth-test-digest-create-key () "Check user credentials in their hashed form." @@ -259,14 +268,12 @@ url-auth-test-challenges (progn ;; We don't know these, just check that they exists. (should (string-match-p ".*response=\".*?\".*" auth)) - ;; url-digest-auth doesn't return these AFAICS. -;;; (should (string-match-p ".*nc=\".*?\".*" auth)) -;;; (should (string-match-p ".*cnonce=\".*?\".*" auth)) - ) + (should (string-match-p ".*nc=\".*?\".*" auth)) + (should (string-match-p ".*cnonce=\".*?\".*" auth))) (should (string-match ".*response=\"\\(.*?\\)\".*" auth)) (should (string= (match-string 1 auth) (plist-get challenge :expected-response)))) - ))) + ))) (ert-deftest url-auth-test-digest-auth-opaque () "Check that `opaque' value is added to result when presented by -- 2.7.0.25.gfc10eb5