From 55feb03139f8cce94f64eaffdbb1b6d84a035cab Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Mon, 19 Dec 2022 23:06:56 +1300 Subject: [PATCH] Include the username in the log messages. --- inc/HTTPAuthSession.php | 8 ++++---- testing/tests/memcache/0001-CachedCredentials.test | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inc/HTTPAuthSession.php b/inc/HTTPAuthSession.php index e5ec3cbb..66cad498 100644 --- a/inc/HTTPAuthSession.php +++ b/inc/HTTPAuthSession.php @@ -464,20 +464,20 @@ class HTTPAuthSession { if (isset($cached_credentials)) { if ($cached_credentials == 'pass') { - dbg_error_log('HTTPAuthLogin', 'CheckCache: Cached credentials are good and valid'); + dbg_error_log('HTTPAuthLogin', 'CheckCache: Cached credentials for %s are good and valid', $username); return 1; } else if ($cached_credentials == 'fail') { - dbg_error_log('HTTPAuthLogin', 'CheckCache: Cached credentials are good and invalid'); + dbg_error_log('HTTPAuthLogin', 'CheckCache: Cached credentials for %s are good and invalid', $username); return 2; } } else { - dbg_error_log('HTTPAuthLogin', 'CheckCache: No stored salted password, need to use auth source'); + dbg_error_log('HTTPAuthLogin', 'CheckCache: No stored salted password for %s, need to use auth source', $username); } } else { - dbg_error_log('HTTPAuthLogin', 'CheckCache: No salt, assuming no cached credentials, need to use auth source'); + dbg_error_log('HTTPAuthLogin', 'CheckCache: No salt stored for %s, assuming no cached credentials, need to use auth source', $username); } # All hope is lost, we must have failed to find anything decent. diff --git a/testing/tests/memcache/0001-CachedCredentials.test b/testing/tests/memcache/0001-CachedCredentials.test index b491e1ae..e683c8e1 100644 --- a/testing/tests/memcache/0001-CachedCredentials.test +++ b/testing/tests/memcache/0001-CachedCredentials.test @@ -1,5 +1,5 @@ # Just check to see if the log line for cached credentials being valid is # present. That is only issued if we're successfully fetch valid credentials # from our cache. -SCRIPT=if grep -q "HTTPAuthLogin:CheckCache: Cached credentials are good and valid" /var/log/apache2/regression-error.log; then echo "Cached credentials worked"; else echo "Ccahed credentials failed"; fi +SCRIPT=if grep -q "HTTPAuthLogin:CheckCache: Cached credentials for user1 are good and valid" /var/log/apache2/regression-error.log; then echo "Cached credentials worked"; else echo "Cached credentials failed"; fi