Merge 0.6->0.7

[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 0ff2797cc84400f1aeadeb40a368dd901451e1fe..784553ea6d4ca499725b1da8d4677dd039fcb9a1 100644 (file)
--- a/plugins/mod_auth_internal_plain.lua
+++ b/plugins/mod_auth_internal_plain.lua
@@ -21,15 +21,12 @@ local hosts = hosts;
 
 local prosody = _G.prosody;
 
-local is_cyrus = usermanager.is_cyrus;
-
 function new_default_provider(host)
        local provider = { name = "internal_plain" };
        log("debug", "initializing default authentication provider for host '%s'", host);
 
        function provider.test_password(username, password)
                log("debug", "test password '%s' for user %s at host %s", password, username, module.host);
-               if is_cyrus(host) then return nil, "Legacy auth not supported with Cyrus SASL."; end
                local credentials = datamanager.load(username, host, "accounts") or {};
        
                if password == credentials.password then
@@ -41,12 +38,10 @@ function new_default_provider(host)
 
        function provider.get_password(username)
                log("debug", "get_password for username '%s' at host '%s'", username, module.host);
-               if is_cyrus(host) then return nil, "Passwords unavailable for Cyrus SASL."; end
                return (datamanager.load(username, host, "accounts") or {}).password;
        end
        
        function provider.set_password(username, password)
-               if is_cyrus(host) then return nil, "Passwords unavailable for Cyrus SASL."; end
                local account = datamanager.load(username, host, "accounts");
                if account then
                        account.password = password;
@@ -56,7 +51,6 @@ function new_default_provider(host)
        end
 
        function provider.user_exists(username)
-               if is_cyrus(host) then return true; end
                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);
@@ -66,14 +60,16 @@ function new_default_provider(host)
        end
 
        function provider.create_user(username, password)
-               if is_cyrus(host) then return nil, "Account creation/modification not available with Cyrus SASL."; end
                return datamanager.store(username, host, "accounts", {password = password});
        end
+       
+       function provider.delete_user(username)
+               return datamanager.store(username, host, "accounts", nil);
+       end
 
        function provider.get_sasl_handler()
-               local realm = module:get_option("sasl_realm") or module.host;
                local getpass_authentication_profile = {
-                       plain = function(username, realm)
+                       plain = function(sasl, username, realm)
                                local prepped_username = nodeprep(username);
                                if not prepped_username then
                                        log("debug", "NODEprep failed on username: %s", username);
@@ -86,7 +82,7 @@ function new_default_provider(host)
                                return password, true;
                        end
                };
-               return new_sasl(realm, getpass_authentication_profile);
+               return new_sasl(module.host, getpass_authentication_profile);
        end
        
        return provider;