From b8a730e398b6469c31f801f4eed056d4e0a3c6a4 Mon Sep 17 00:00:00 2001 From: Garri Djavadyan Date: Sat, 17 Dec 2016 23:03:37 +1300 Subject: [PATCH] Bug 3290: authenticate_ttl not working for digest authentication --- src/auth/digest/UserRequest.cc | 7 +------ src/auth/digest/auth_digest.cc | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/auth/digest/UserRequest.cc b/src/auth/digest/UserRequest.cc index 3305db575f..af28d952fb 100644 --- a/src/auth/digest/UserRequest.cc +++ b/src/auth/digest/UserRequest.cc @@ -158,12 +158,7 @@ Auth::Digest::UserRequest::authenticate(HttpRequest * request, ConnStateData * c auth_user->credentials(Auth::Ok); /* password was checked and did match */ - debugs(29, 4, HERE << "user '" << auth_user->username() << "' validated OK"); - - /* auth_user is now linked, we reset these values - * after external auth occurs anyway */ - auth_user->expiretime = current_time.tv_sec; - return; + debugs(29, 4, "user '" << auth_user->username() << "' validated OK"); } Auth::Direction diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc index 2178098d23..ff21099c7f 100644 --- a/src/auth/digest/auth_digest.cc +++ b/src/auth/digest/auth_digest.cc @@ -1091,6 +1091,10 @@ Auth::Digest::Config::decode(char const *proxy_auth) * the user agent won't change user name without warning. */ authDigestUserLinkNonce(digest_user, nonce); + + /* auth_user is now linked, we reset these values + * after external auth occurs anyway */ + auth_user->expiretime = current_time.tv_sec; } else { debugs(29, 9, HERE << "Found user '" << username << "' in the user cache as '" << auth_user << "'"); digest_user = static_cast(auth_user.getRaw()); -- 2.47.2