Pass the cache key value explicitly from the callers

This makes the cache class more flexibly used for other types of auth
credentials not based on user names.

Also, replace debugs stating 'username cache' with 'credentials cache'

diff --git a/src/auth/CredentialsCache.cc b/src/auth/CredentialsCache.cc
index 214a45d0c67ee113da82872bbae657a5f5d6c941..969a0711d4745ce386586ae5291d2833be956396 100644 (file)
--- a/src/auth/CredentialsCache.cc
+++ b/src/auth/CredentialsCache.cc
@@ -28,19 +28,19 @@ public:
     {}
 
     virtual ~CredentialCacheRr() {
-        debugs(29, 5, "Terminating username cache: " << name);
+        debugs(29, 5, "Terminating Auth credentials cache: " << name);
         // invalidate the CBDATA reference.
         // causes Auth::*::User::Cache() to produce nil / invalid pointer
         delete whichCache.get();
     }
 
     virtual void endingShutdown() override {
-        debugs(29, 5, "Clearing username cache: " << name);
+        debugs(29, 5, "Clearing Auth credentials cache: " << name);
         whichCache->reset();
     }
 
     virtual void syncConfig() override {
-        debugs(29, 5, "Reconfiguring username cache: " << name);
+        debugs(29, 5, "Reconfiguring Auth credentials cache: " << name);
         whichCache->doConfigChangeCleanup();
     }
 
@@ -58,7 +58,7 @@ CredentialsCache::CredentialsCache(const char *name, const char * const prettyEv
     gcScheduled_(false),
     cacheCleanupEventName(prettyEvName)
 {
-    debugs(29, 5, "initializing " << name << " username cache");
+    debugs(29, 5, "initializing " << name << " credentials cache");
     RegisterRunner(new Auth::CredentialCacheRr(name, this));
 }
 
@@ -102,10 +102,10 @@ CredentialsCache::cleanup()
 }
 
 void
-CredentialsCache::insert(Auth::User::Pointer anAuth_user)
+CredentialsCache::insert(const SBuf &userKey, Auth::User::Pointer anAuth_user)
 {
-    debugs(29, 6, "adding " << anAuth_user->userKey());
-    store_[anAuth_user->userKey()] = anAuth_user;
+    debugs(29, 6, "adding " << userKey << " (" << anAuth_user->username() << ")");
+    store_[userKey] = anAuth_user;
     scheduleCleanup();
 }
 

diff --git a/src/auth/CredentialsCache.h b/src/auth/CredentialsCache.h
index 9c91f6afc5471bc3e0ec5d9d4235e4ca2a74a381..b310839ae7d17bf773fe7e93609b7c3b3294a6e2 100644 (file)
--- a/src/auth/CredentialsCache.h
+++ b/src/auth/CredentialsCache.h
@@ -37,8 +37,8 @@ public:
     /// \returns a pointer to cached credentials, or nil if none found
     Auth::User::Pointer lookup(const SBuf &userKey) const;
 
-    /// add an user to the cache
-    void insert(Auth::User::Pointer anAuth_user);
+    /// add an user to the cache with the provided key
+    void insert(const SBuf &userKey, Auth::User::Pointer anAuth_user);
 
     /// clear cache
     void reset() { store_.clear(); }

diff --git a/src/auth/basic/User.cc b/src/auth/basic/User.cc
index 4a3749a9b03cb5dc606b084a255adcc94e80025e..af3abbecb9802b98c5131f0cbbbf378a64f5fcc2 100644 (file)
--- a/src/auth/basic/User.cc
+++ b/src/auth/basic/User.cc
@@ -90,6 +90,6 @@ Auth::Basic::User::Cache()
 void
 Auth::Basic::User::addToNameCache()
 {
-    Cache()->insert(this);
+    Cache()->insert(userKey(), this);
 }
 

diff --git a/src/auth/digest/User.cc b/src/auth/digest/User.cc
index 9e4a43080196ab050ddcbceec63cbe9e81c092b7..a9e6f53cf1764d79fd485f7d67649047d30ea0a2 100644 (file)
--- a/src/auth/digest/User.cc
+++ b/src/auth/digest/User.cc
@@ -83,6 +83,6 @@ Auth::Digest::User::Cache()
 void
 Auth::Digest::User::addToNameCache()
 {
-    Cache()->insert(this);
+    Cache()->insert(userKey(), this);
 }
 

diff --git a/src/auth/negotiate/User.cc b/src/auth/negotiate/User.cc
index 56d15475f75a4074b2d18a2006810df86e7a91c5..fa07371236164a7b03af4acf537269bc6b77e34c 100644 (file)
--- a/src/auth/negotiate/User.cc
+++ b/src/auth/negotiate/User.cc
@@ -38,6 +38,6 @@ Auth::Negotiate::User::Cache()
 void
 Auth::Negotiate::User::addToNameCache()
 {
-    Cache()->insert(this);
+    Cache()->insert(userKey(), this);
 }
 

diff --git a/src/auth/ntlm/User.cc b/src/auth/ntlm/User.cc
index f613737684b2eaed87a9d00d85ad54849fbd9c6e..d006f6243ed58b5d38bb27342efb06c1765ed885 100644 (file)
--- a/src/auth/ntlm/User.cc
+++ b/src/auth/ntlm/User.cc
@@ -38,6 +38,6 @@ Auth::Ntlm::User::Cache()
 void
 Auth::Ntlm::User::addToNameCache()
 {
-    Cache()->insert(this);
+    Cache()->insert(userKey(), this);
 }