net.dns: Close voided sockets, so they don't stay in net.server

[prosody.git] / core / usermanager.lua

diff --git a/core/usermanager.lua b/core/usermanager.lua
index 0152afd76cd1fba5077d197ee02f552b655ab25a..417d70375bd8d315780db7e32e83496da71267a6 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;
 
@@ -40,7 +43,10 @@ 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
+               if config.get(host, "core", "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
@@ -84,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)
@@ -97,6 +110,7 @@ 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);
@@ -108,7 +122,7 @@ function is_admin(jid, host)
        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
@@ -121,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