mod_admin_telnet: Don't rely on getpeerchain returning an empty list

[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..2b041e432021283ce9aac727532afb6e95376421 100644 (file)
--- a/plugins/mod_auth_internal_hashed.lua
+++ b/plugins/mod_auth_internal_hashed.lua
@@ -7,13 +7,13 @@
 -- 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 accounts = module:open_store("accounts");
 
 local to_hex;
 do
@@ -45,7 +45,7 @@ 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 {};
+       local credentials = accounts:get(username) or {};
 
        if credentials.password ~= nil and string.len(credentials.password) ~= 0 then
                if credentials.password ~= password then
@@ -76,7 +76,7 @@ function provider.test_password(username, password)
 end
 
 function provider.set_password(username, password)
-       local account = datamanager.load(username, host, "accounts");
+       local account = accounts:get(username);
        if account then
                account.salt = account.salt or generate_uuid();
                account.iteration_count = account.iteration_count or iteration_count;
@@ -88,13 +88,13 @@ function provider.set_password(username, password)
                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);
                return nil, "Auth failed. Invalid username";
@@ -102,37 +102,36 @@ function provider.user_exists(username)
        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