X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fusermanager.lua;h=08343bee3c580233e45ab4ccb4eb87fd61f3e577;hb=b85f75e110d99b890fc22186cb2ad4d0c8f1d0a5;hp=fe525bc13c96c4ab62982492b35e5252324d45a6;hpb=5d778cf2f15911224564e54fe0556a0c8cc7b905;p=prosody.git diff --git a/core/usermanager.lua b/core/usermanager.lua index fe525bc1..08343bee 100644 --- a/core/usermanager.lua +++ b/core/usermanager.lua @@ -6,39 +6,49 @@ -- 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 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 require_provisioning = config.get("*", "core", "cyrus_require_provisioning") or false; +local sasl_new = require "util.sasl".new; +local storagemanager = require "core.storagemanager"; local prosody = _G.prosody; local setmetatable = setmetatable; -local default_provider = "internal"; +local default_provider = "internal_plain"; module "usermanager" function new_null_provider() - local function dummy() end; - return setmetatable({name = "null"}, { __index = function() return 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(self, method) return dummy; end + }); end -local function host_handler(host) +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; + 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); @@ -50,18 +60,16 @@ local function host_handler(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, "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 end; -prosody.events.add_handler("host-activated", host_handler, 100); -prosody.events.add_handler("component-activated", host_handler, 100); +prosody.events.add_handler("host-activated", initialize_host, 100); -function is_cyrus(host) return config.get(host, "core", "sasl_backend") == "cyrus"; end - -function test_password(username, password, host) +function test_password(username, host, password) return hosts[host].users.test_password(username, password); end @@ -81,8 +89,19 @@ function create_user(username, password, host) return hosts[host].users.create_user(username, password); end -function get_supported_methods(host) - return hosts[host].users.get_supported_methods(); +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) @@ -90,20 +109,47 @@ function get_provider(host) end function is_admin(jid, host) - if host and host ~= "*" then - return hosts[host].users.is_admin(jid); - else -- Test only whether this JID is a global admin - local admins = config.get("*", "core", "admins"); - if type(admins) == "table" then - jid = jid_bare(jid); - for _,admin in ipairs(admins) do - if admin == jid then return true; end + 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, "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 jid_prep(admin) == jid then + is_admin = true; + break; + end + end + elseif host_admins then + 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 + if jid_prep(admin) == jid then + is_admin = true; + break; + end end - elseif admins then - log("error", "Option 'admins' for host '%s' is not a table", host); + elseif global_admins then + log("error", "Global option 'admins' is not a list"); end - return nil; 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); + end + return is_admin or false; end return _M;