util.events: Remove an event's table when it has no more handlers.

[prosody.git] / core / usermanager.lua

diff --git a/core/usermanager.lua b/core/usermanager.lua
index 27f1a7df3aab71d241c8821233ac1cc86f53f5e9..1aea0de9b86f6c1ad17519023b86cd9e8c20f9cb 100644 (file)
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -6,18 +6,14 @@
 -- COPYING file in the source package for more information.
 --
 
-local datamanager = require "util.datamanager";
 local modulemanager = require "core.modulemanager";
 local log = require "util.logger".init("usermanager");
 local type = type;
-local error = error;
 local ipairs = ipairs;
-local hashes = require "util.hashes";
 local jid_bare = require "util.jid".bare;
 local config = require "core.configmanager";
 local hosts = hosts;
-
-local require_provisioning = config.get("*", "core", "cyrus_require_provisioning") or false;
+local sasl_new = require "util.sasl".new;
 
 local prosody = _G.prosody;
 
@@ -29,11 +25,14 @@ module "usermanager"
 
 function new_null_provider()
        local function dummy() end;
-       return setmetatable({name = "null"}, { __index = function() return dummy; end });
+       local function dummy_get_sasl_handler() return sasl_new(nil, {}); end
+       return setmetatable({name = "null", get_sasl_handler = dummy_get_sasl_handler}, { __index = function() return dummy; end });
 end
 
 function initialize_host(host)
        local host_session = hosts[host];
+       if host_session.type ~= "local" then return; end
+       
        host_session.events.add_handler("item-added/auth-provider", function (event)
                local provider = event.item;
                local auth_provider = config.get(host, "core", "authentication") or default_provider;
@@ -50,18 +49,15 @@ function initialize_host(host)
                        host_session.users = new_null_provider();
                end
        end);
-       host_session.users = new_null_provider(); -- Start with the default usermanager provider
-       local auth_provider = config.get(host, "core", "authentication") or default_provider;
-       if auth_provider ~= "null" then
-               modulemanager.load(host, "auth_"..auth_provider);
-       end
+       host_session.users = new_null_provider(); -- Start with the default usermanager provider
+       local auth_provider = config.get(host, "core", "authentication") or default_provider;
+       if auth_provider ~= "null" then
+               modulemanager.load(host, "auth_"..auth_provider);
+       end
 end;
 prosody.events.add_handler("host-activated", initialize_host, 100);
-prosody.events.add_handler("component-activated", initialize_host, 100);
-
-function is_cyrus(host) return config.get(host, "core", "sasl_backend") == "cyrus"; end
 
-function test_password(username, password, host)
+function test_password(username, host, password)
        return hosts[host].users.test_password(username, password);
 end
 
@@ -105,7 +101,7 @@ function is_admin(jid, host)
                                        break;
                                end
                        end
-               elseif admins then
+               elseif host_admins then
                        log("error", "Option 'admins' for host '%s' is not a list", host);
                end
        end
@@ -118,13 +114,13 @@ function is_admin(jid, host)
                                        break;
                                end
                        end
-               elseif admins then
+               elseif global_admins then
                        log("error", "Global option 'admins' is not a list");
                end
        end
        
        -- Still not an admin, check with auth provider
-       if not is_admin and host ~= "*" and hosts[host].users.is_admin then
+       if not is_admin and host ~= "*" and hosts[host].users and hosts[host].users.is_admin then
                is_admin = hosts[host].users.is_admin(jid);
        end
        return is_admin or false;