mod_admin_telnet: Don't rely on getpeerchain returning an empty list

[prosody.git] / core / usermanager.lua

diff --git a/core/usermanager.lua b/core/usermanager.lua
index 9e5a016c5c0fa75640bfe60c87eb7a20f9d98c4e..08343bee3c580233e45ab4ccb4eb87fd61f3e577 100644 (file)
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -10,11 +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;
 
@@ -40,8 +42,11 @@ function initialize_host(host)
        
        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 = setmetatable(provider, provider_mt);
                end
@@ -56,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
@@ -85,11 +90,18 @@ function create_user(username, password, host)
 end
 
 function delete_user(username, host)
-       return hosts[host].users.delete_user(username);
+       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 get_sasl_handler(host)
-       return hosts[host].users.get_sasl_handler();
+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)
@@ -104,8 +116,8 @@ function is_admin(jid, host)
        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