------------------------------------------------------------
revno: 12663
revision-id: squid3@treenet.co.nz-20131129042532-u2ycsfmikvv0ro7k
parent: squid3@treenet.co.nz-20131129042251-0lk5dx346f6oci1x
fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3782
author: Frederic Bourgeois <fredbmail@free.fr>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Thu 2013-11-28 21:25:32 -0700
message:
  Bug 3782: Digest authentication not obeying nonce_max_count
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20131129042532-u2ycsfmikvv0ro7k
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 8ddc991181f4c5ef1f37b452ce54edc4be971653
# timestamp: 2013-11-29 04:30:09 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20131129042251-\
#   0lk5dx346f6oci1x
# 
# Begin patch
=== modified file 'src/auth/digest/UserRequest.cc'
--- src/auth/digest/UserRequest.cc	2013-01-28 04:16:21 +0000
+++ src/auth/digest/UserRequest.cc	2013-11-29 04:25:32 +0000
@@ -149,14 +149,14 @@
             digest_request->setDenyMessage("Incorrect password");
             return;
         }
+    }
 
-        /* check for stale nonce */
-        if (!authDigestNonceIsValid(digest_request->nonce, digest_request->nc)) {
-            debugs(29, 3, HERE << "user '" << auth_user->username() << "' validated OK but nonce stale");
-            auth_user->credentials(Auth::Failed);
-            digest_request->setDenyMessage("Stale nonce");
-            return;
-        }
+    /* check for stale nonce */
+    if (!authDigestNonceIsValid(digest_request->nonce, digest_request->nc)) {
+        debugs(29, 3, "user '" << auth_user->username() << "' validated OK but nonce stale");
+        auth_user->credentials(Auth::Failed);
+        digest_request->setDenyMessage("Stale nonce");
+        return;
     }
 
     auth_user->credentials(Auth::Ok);