modulemanager: Reduce warning to debug level message about modules already being...

[prosody.git] / core / usermanager.lua

diff --git a/core/usermanager.lua b/core/usermanager.lua
index 2e64af8c48a82351c48b02d8fcd75417d6562b63..08343bee3c580233e45ab4ccb4eb87fd61f3e577 100644 (file)
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -10,10 +10,13 @@ local modulemanager = require "core.modulemanager";
 local log = require "util.logger".init("usermanager");
 local type = type;
 local ipairs = ipairs;
+local pairs = pairs;
 local jid_bare = require "util.jid".bare;
+local jid_prep = require "util.jid".prep;
 local config = require "core.configmanager";
 local hosts = hosts;
 local sasl_new = require "util.sasl".new;
+local storagemanager = require "core.storagemanager";
 
 local prosody = _G.prosody;
 
@@ -24,21 +27,28 @@ local default_provider = "internal_plain";
 module "usermanager"
 
 function new_null_provider()
-       local function dummy() end;
+       local function dummy() return nil, "method not implemented"; 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 });
+       return setmetatable({name = "null", get_sasl_handler = dummy_get_sasl_handler}, {
+               __index = function(self, method) return dummy; end
+       });
 end
 
+local provider_mt = { __index = new_null_provider() };
+
 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;
-               if config.get(host, "core", "anonymous_login") then auth_provider = "anonymous"; end -- COMPAT 0.7
+               local auth_provider = config.get(host, "authentication") or default_provider;
+               if config.get(host, "anonymous_login") then
+                       log("error", "Deprecated config option 'anonymous_login'. Use authentication = 'anonymous' instead.");
+                       auth_provider = "anonymous";
+               end -- COMPAT 0.7
                if provider.name == auth_provider then
-                       host_session.users = provider;
+                       host_session.users = setmetatable(provider, provider_mt);
                end
                if host_session.users ~= nil and host_session.users.name ~= nil then
                        log("debug", "host '%s' now set to use user provider '%s'", host, host_session.users.name);
@@ -51,8 +61,8 @@ function initialize_host(host)
                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 config.get(host, "core", "anonymous_login") then auth_provider = "anonymous"; end -- COMPAT 0.7
+       local auth_provider = config.get(host, "authentication") or default_provider;
+       if config.get(host, "anonymous_login") then auth_provider = "anonymous"; end -- COMPAT 0.7
        if auth_provider ~= "null" then
                modulemanager.load(host, "auth_"..auth_provider);
        end
@@ -79,8 +89,19 @@ function create_user(username, password, host)
        return hosts[host].users.create_user(username, password);
 end
 
-function get_sasl_handler(host)
-       return hosts[host].users.get_sasl_handler();
+function delete_user(username, host)
+       local ok, err = hosts[host].users.delete_user(username);
+       if not ok then return nil, err; end
+       prosody.events.fire_event("user-deleted", { username = username, host = host });
+       return storagemanager.purge(username, host);
+end
+
+function users(host)
+       return hosts[host].users.users();
+end
+
+function get_sasl_handler(host, session)
+       return hosts[host].users.get_sasl_handler(session);
 end
 
 function get_provider(host)
@@ -88,17 +109,20 @@ function get_provider(host)
 end
 
 function is_admin(jid, host)
+       if host and not hosts[host] then return false; end
+       if type(jid) ~= "string" then return false; end
+
        local is_admin;
        jid = jid_bare(jid);
        host = host or "*";
        
-       local host_admins = config.get(host, "core", "admins");
-       local global_admins = config.get("*", "core", "admins");
+       local host_admins = config.get(host, "admins");
+       local global_admins = config.get("*", "admins");
        
        if host_admins and host_admins ~= global_admins then
                if type(host_admins) == "table" then
                        for _,admin in ipairs(host_admins) do
-                               if admin == jid then
+                               if jid_prep(admin) == jid then
                                        is_admin = true;
                                        break;
                                end
@@ -111,7 +135,7 @@ function is_admin(jid, host)
        if not is_admin and global_admins then
                if type(global_admins) == "table" then
                        for _,admin in ipairs(global_admins) do
-                               if admin == jid then
+                               if jid_prep(admin) == jid then
                                        is_admin = true;
                                        break;
                                end