portmanager: Add luacheck annotations

[prosody.git] / core / usermanager.lua

diff --git a/core/usermanager.lua b/core/usermanager.lua
index 2ca0aef16a5057aa746f19d65b50aad48eed8e8d..3a2b23a252a1b78e09463a791888e28154e5e8c0 100644 (file)
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -10,7 +10,6 @@ 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";
@@ -30,7 +29,7 @@ function new_null_provider()
        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(self, method) return dummy; end
+               __index = function(self, method) return dummy; end --luacheck: ignore 212
        });
 end
 
@@ -39,11 +38,11 @@ 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
+               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
@@ -51,7 +50,7 @@ function initialize_host(host)
                        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);
+                       log("debug", "Host '%s' now set to use user provider '%s'", host, host_session.users.name);
                end
        end);
        host_session.events.add_handler("item-removed/auth-provider", function (event)
@@ -61,8 +60,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
@@ -93,7 +92,11 @@ 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.get_driver(host):purge(username);
+       return storagemanager.purge(username, host);
+end
+
+function users(host)
+       return hosts[host].users.users();
 end
 
 function get_sasl_handler(host, session)
@@ -111,10 +114,10 @@ function is_admin(jid, host)
        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
@@ -127,7 +130,7 @@ function is_admin(jid, host)
                        log("error", "Option 'admins' for host '%s' is not a list", host);
                end
        end
-       
+
        if not is_admin and global_admins then
                if type(global_admins) == "table" then
                        for _,admin in ipairs(global_admins) do
@@ -140,7 +143,7 @@ function is_admin(jid, host)
                        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 and hosts[host].users.is_admin then
                is_admin = hosts[host].users.is_admin(jid);