From 6b634dc323fdfd75bac737a38faeb171fce705df Mon Sep 17 00:00:00 2001
From: Frederic Bourgeois <fredbmail@free.fr>
Date: Tue, 20 Jan 2015 02:29:45 -0800
Subject: [PATCH] Bug 4066: Digest auth nonce indefinite rollover

---
 src/auth/digest/Config.cc      |  7 +------
 src/auth/digest/UserRequest.cc | 12 ++++++++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/auth/digest/Config.cc b/src/auth/digest/Config.cc
index e017757838..beaf946e7d 100644
--- a/src/auth/digest/Config.cc
+++ b/src/auth/digest/Config.cc
@@ -1013,12 +1013,7 @@ Auth::Digest::Config::decode(char const *proxy_auth, const char *aRequestRealm)
         debugs(29, 2, "Username for the nonce does not equal the username for the request");
         nonce = NULL;
     }
-    /* check for stale nonce */
-    if (authDigestNonceIsStale(nonce)) {
-        debugs(29, 3, "The received nonce is stale from " << username);
-        digest_request->setDenyMessage("Stale nonce");
-        nonce = NULL;
-    }
+
     if (!nonce) {
         /* we couldn't find a matching nonce! */
         debugs(29, 2, "Unexpected or invalid nonce received from " << username);
diff --git a/src/auth/digest/UserRequest.cc b/src/auth/digest/UserRequest.cc
index 19ea3115de..6ff06f6367 100644
--- a/src/auth/digest/UserRequest.cc
+++ b/src/auth/digest/UserRequest.cc
@@ -173,10 +173,14 @@ Auth::Digest::UserRequest::authenticate(HttpRequest * request, ConnStateData *,
     }
 
     /* 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::Handshake);
-        digest_request->setDenyMessage("Stale nonce");
+    /* check Auth::Pending to avoid loop */
+
+    if (!authDigestNonceIsValid(digest_request->nonce, digest_request->nc) && user()->credentials() != Auth::Pending) {
+        debugs(29, 3, auth_user->username() << "' validated OK but nonce stale: " << digest_request->nonceb64);
+        /* Pending prevent banner and makes a ldap control */
+        auth_user->credentials(Auth::Pending);
+        nonce->flags.valid = false;
+        authDigestNoncePurge(nonce);
         return;
     }
 
-- 
2.47.3