mod_storage_sql: Removed unnecessary initialization of a variable.

[prosody.git] / core / usermanager.lua

diff --git a/core/usermanager.lua b/core/usermanager.lua
index 5fc4a8229edbe60332818846ce13bd59872c82fe..5e2e41fcd31c72a53afc2de9d6e6f901d38188ec 100644 (file)
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -6,13 +6,10 @@
 -- 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;
@@ -27,18 +24,25 @@ 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
                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);
@@ -50,14 +54,14 @@ 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 config.get(host, "core", "anonymous_login") then auth_provider = "anonymous"; end -- COMPAT 0.7
+       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 test_password(username, host, password)
        return hosts[host].users.test_password(username, password);
@@ -79,6 +83,10 @@ function create_user(username, password, host)
        return hosts[host].users.create_user(username, password);
 end
 
+function delete_user(username, host)
+       return hosts[host].users.delete_user(username);
+end
+
 function get_sasl_handler(host)
        return hosts[host].users.get_sasl_handler();
 end
@@ -122,7 +130,7 @@ function is_admin(jid, host)
        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;