Merge Tobias SCRAM-PLUS work

[prosody.git] / plugins / mod_auth_internal_hashed.lua

diff --git a/plugins/mod_auth_internal_hashed.lua b/plugins/mod_auth_internal_hashed.lua
index 8a1c2b3ef32526166b17b642c8fd4cd3c1781570..fb87bb9f317088690a2353898dbf54a2dd44c55b 100644 (file)
--- a/plugins/mod_auth_internal_hashed.lua
+++ b/plugins/mod_auth_internal_hashed.lua
@@ -7,12 +7,14 @@
 -- COPYING file in the source package for more information.
 --
 
-local log = require "util.logger".init("auth_internal_hashed");
 local getAuthenticationDatabaseSHA1 = require "util.sasl.scram".getAuthenticationDatabaseSHA1;
 local usermanager = require "core.usermanager";
 local generate_uuid = require "util.uuid".generate;
 local new_sasl = require "util.sasl".new;
 
+local log = module._log;
+local host = module.host;
+
 local accounts = module:open_store("accounts");
 
 local to_hex;
@@ -39,11 +41,11 @@ end
 -- Default; can be set per-user
 local iteration_count = 4096;
 
-local host = module.host;
 -- define auth provider
 local provider = {};
 
 function provider.test_password(username, password)
+       log("debug", "test password for user '%s'", username);
        local credentials = accounts:get(username) or {};
 
        if credentials.password ~= nil and string.len(credentials.password) ~= 0 then
@@ -75,6 +77,7 @@ function provider.test_password(username, password)
 end
 
 function provider.set_password(username, password)
+       log("debug", "set_password for username '%s'", username);
        local account = accounts:get(username);
        if account then
                account.salt = account.salt or generate_uuid();
@@ -95,7 +98,7 @@ end
 function provider.user_exists(username)
        local account = accounts:get(username);
        if not account then
-               log("debug", "account not found for username '%s' at host '%s'", username, host);
+               log("debug", "account not found for username '%s'", username);
                return nil, "Auth failed. Invalid username";
        end
        return true;