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 b61fba80f78a7ad9158b0c3cfbce624d576cd8cf..fb87bb9f317088690a2353898dbf54a2dd44c55b 100644 (file)
--- a/plugins/mod_auth_internal_hashed.lua
+++ b/plugins/mod_auth_internal_hashed.lua
@@ -7,13 +7,15 @@
 -- COPYING file in the source package for more information.
 --
 
-local datamanager = require "util.datamanager";
-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 nodeprep = require "util.encodings".stringprep.nodeprep;
+
+local log = module._log;
+local host = module.host;
+
+local accounts = module:open_store("accounts");
 
 local to_hex;
 do
@@ -39,13 +41,12 @@ end
 -- Default; can be set per-user
 local iteration_count = 4096;
 
-local host = module.host;
 -- define auth provider
 local provider = {};
-log("debug", "initializing internal_hashed authentication provider for host '%s'", host);
 
 function provider.test_password(username, password)
-       local credentials = datamanager.load(username, host, "accounts") or {};
+       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
                if credentials.password ~= password then
@@ -62,12 +63,12 @@ function provider.test_password(username, password)
        if credentials.iteration_count == nil or credentials.salt == nil or string.len(credentials.salt) == 0 then
                return nil, "Auth failed. Stored salt and iteration count information is not complete.";
        end
-       
+
        local valid, stored_key, server_key = getAuthenticationDatabaseSHA1(password, credentials.salt, credentials.iteration_count);
-       
+
        local stored_key_hex = to_hex(stored_key);
        local server_key_hex = to_hex(server_key);
-       
+
        if valid and stored_key_hex == credentials.stored_key and server_key_hex == credentials.server_key then
                return true;
        else
@@ -76,66 +77,66 @@ function provider.test_password(username, password)
 end
 
 function provider.set_password(username, password)
-       local account = datamanager.load(username, host, "accounts");
+       log("debug", "set_password for username '%s'", username);
+       local account = accounts:get(username);
        if account then
                account.salt = account.salt or generate_uuid();
                account.iteration_count = account.iteration_count or iteration_count;
                local valid, stored_key, server_key = getAuthenticationDatabaseSHA1(password, account.salt, account.iteration_count);
                local stored_key_hex = to_hex(stored_key);
                local server_key_hex = to_hex(server_key);
-               
+
                account.stored_key = stored_key_hex
                account.server_key = server_key_hex
 
                account.password = nil;
-               return datamanager.store(username, host, "accounts", account);
+               return accounts:set(username, account);
        end
        return nil, "Account not available.";
 end
 
 function provider.user_exists(username)
-       local account = datamanager.load(username, host, "accounts");
+       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;
 end
 
+function provider.users()
+       return accounts:users();
+end
+
 function provider.create_user(username, password)
        if password == nil then
-               return datamanager.store(username, host, "accounts", {});
+               return accounts:set(username, {});
        end
        local salt = generate_uuid();
        local valid, stored_key, server_key = getAuthenticationDatabaseSHA1(password, salt, iteration_count);
        local stored_key_hex = to_hex(stored_key);
        local server_key_hex = to_hex(server_key);
-       return datamanager.store(username, host, "accounts", {stored_key = stored_key_hex, server_key = server_key_hex, salt = salt, iteration_count = iteration_count});
+       return accounts:set(username, {stored_key = stored_key_hex, server_key = server_key_hex, salt = salt, iteration_count = iteration_count});
 end
 
 function provider.delete_user(username)
-       return datamanager.store(username, host, "accounts", nil);
+       return accounts:set(username, nil);
 end
 
 function provider.get_sasl_handler()
        local testpass_authentication_profile = {
                plain_test = function(sasl, username, password, realm)
-                       local prepped_username = nodeprep(username);
-                       if not prepped_username then
-                               log("debug", "NODEprep failed on username: %s", username);
-                               return "", nil;
-                       end
-                       return usermanager.test_password(prepped_username, realm, password), true;
+                       return usermanager.test_password(username, realm, password), true;
                end,
                scram_sha_1 = function(sasl, username, realm)
-                       local credentials = datamanager.load(username, host, "accounts");
+                       local credentials = accounts:get(username);
                        if not credentials then return; end
                        if credentials.password then
                                usermanager.set_password(username, credentials.password, host);
-                               credentials = datamanager.load(username, host, "accounts");
+                               credentials = accounts:get(username);
                                if not credentials then return; end
                        end
-                       
+
                        local stored_key, server_key, iteration_count, salt = credentials.stored_key, credentials.server_key, credentials.iteration_count, credentials.salt;
                        stored_key = stored_key and from_hex(stored_key);
                        server_key = server_key and from_hex(server_key);
@@ -144,6 +145,6 @@ function provider.get_sasl_handler()
        };
        return new_sasl(host, testpass_authentication_profile);
 end
-       
+
 module:provides("auth", provider);