mod_admin_telnet: Make timer:info command more robust

[prosody.git] / plugins / mod_auth_internal_plain.lua

diff --git a/plugins/mod_auth_internal_plain.lua b/plugins/mod_auth_internal_plain.lua
index 89dd7f1bcdfe4c80c03ac1b518747c54c069bfd1..db5284320e78e495f2bebda1999619da40715f63 100644 (file)
--- a/plugins/mod_auth_internal_plain.lua
+++ b/plugins/mod_auth_internal_plain.lua
@@ -6,79 +6,76 @@
 -- COPYING file in the source package for more information.
 --
 
-local datamanager = require "util.datamanager";
 local usermanager = require "core.usermanager";
 local new_sasl = require "util.sasl".new;
-local nodeprep = require "util.encodings".stringprep.nodeprep;
 
 local log = module._log;
+local host = module.host;
 
-function new_default_provider(host)
-       local provider = { name = "internal_plain" };
-       log("debug", "initializing internal_plain authentication provider for host '%s'", host);
+local accounts = module:open_store("accounts");
 
-       function provider.test_password(username, password)
-               log("debug", "test password '%s' for user %s at host %s", password, username, module.host);
-               local credentials = datamanager.load(username, host, "accounts") or {};
-       
-               if password == credentials.password then
-                       return true;
-               else
-                       return nil, "Auth failed. Invalid username or password.";
-               end
-       end
+-- define auth provider
+local provider = {};
 
-       function provider.get_password(username)
-               log("debug", "get_password for username '%s' at host '%s'", username, module.host);
-               return (datamanager.load(username, host, "accounts") or {}).password;
-       end
-       
-       function provider.set_password(username, password)
-               local account = datamanager.load(username, host, "accounts");
-               if account then
-                       account.password = password;
-                       return datamanager.store(username, host, "accounts", account);
-               end
-               return nil, "Account not available.";
-       end
+function provider.test_password(username, password)
+       log("debug", "test password for user '%s'", username);
+       local credentials = accounts:get(username) or {};
 
-       function provider.user_exists(username)
-               local account = datamanager.load(username, host, "accounts");
-               if not account then
-                       log("debug", "account not found for username '%s' at host '%s'", username, module.host);
-                       return nil, "Auth failed. Invalid username";
-               end
+       if password == credentials.password then
                return true;
+       else
+               return nil, "Auth failed. Invalid username or password.";
        end
+end
 
-       function provider.create_user(username, password)
-               return datamanager.store(username, host, "accounts", {password = password});
+function provider.get_password(username)
+       log("debug", "get_password for username '%s'", username);
+       return (accounts:get(username) or {}).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.password = password;
+               return accounts:set(username, account);
        end
-       
-       function provider.delete_user(username)
-               return datamanager.store(username, host, "accounts", nil);
+       return nil, "Account not available.";
+end
+
+function provider.user_exists(username)
+       local account = accounts:get(username);
+       if not account then
+               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)
+       return accounts:set(username, {password = password});
+end
+
+function provider.delete_user(username)
+       return accounts:set(username, nil);
+end
 
-       function provider.get_sasl_handler()
-               local getpass_authentication_profile = {
-                       plain = function(sasl, username, realm)
-                               local prepped_username = nodeprep(username);
-                               if not prepped_username then
-                                       log("debug", "NODEprep failed on username: %s", username);
-                                       return "", nil;
-                               end
-                               local password = usermanager.get_password(prepped_username, realm);
-                               if not password then
-                                       return "", nil;
-                               end
-                               return password, true;
+function provider.get_sasl_handler()
+       local getpass_authentication_profile = {
+               plain = function(sasl, username, realm)
+                       local password = usermanager.get_password(username, realm);
+                       if not password then
+                               return "", nil;
                        end
-               };
-               return new_sasl(module.host, getpass_authentication_profile);
-       end
-       
-       return provider;
+                       return password, true;
+               end
+       };
+       return new_sasl(host, getpass_authentication_profile);
 end
 
-module:add_item("auth-provider", new_default_provider(module.host));
+module:provides("auth", provider);