X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fusermanager.lua;h=5fc4a8229edbe60332818846ce13bd59872c82fe;hb=ac4ddd86d7ab877a0efb325169555c2ef91e4b08;hp=baf4846403667b9418a90ee351b962133a8c758c;hpb=4815d9ae20eec4c1b27cac2b8556780a45804ce8;p=prosody.git

diff --git a/core/usermanager.lua b/core/usermanager.lua
index baf48464..5fc4a822 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -7,6 +7,7 @@
 --
 
 local datamanager = require "util.datamanager";
+local modulemanager = require "core.modulemanager";
 local log = require "util.logger".init("usermanager");
 local type = type;
 local error = error;
@@ -15,27 +16,28 @@ local hashes = require "util.hashes";
 local jid_bare = require "util.jid".bare;
 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 prosody = _G.prosody;
 
 local setmetatable = setmetatable;
 
+local default_provider = "internal_plain";
+
 module "usermanager"
 
 function new_null_provider()
 	local function dummy() end;
-	return setmetatable({name = "dummyauth"}, { __index = function() return dummy; 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 });
 end
 
-local function host_handler(host)
+function initialize_host(host)
 	local host_session = hosts[host];
 	host_session.events.add_handler("item-added/auth-provider", function (event)
 		local provider = event.item;
-		if config.get(host, "core", "authentication") == nil and provider.name == "default" then
-			host_session.users = provider;
-		elseif config.get(host, "core", "authentication") == provider.name then
+		local auth_provider = config.get(host, "core", "authentication") or default_provider;
+		if provider.name == auth_provider then
 			host_session.users = provider;
 		end
 		if host_session.users ~= nil and host_session.users.name ~= nil then
@@ -49,13 +51,15 @@ local function host_handler(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 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);
-
-function is_cyrus(host) return config.get(host, "core", "sasl_backend") == "cyrus"; end
+prosody.events.add_handler("host-activated", initialize_host, 100);
+prosody.events.add_handler("component-activated", initialize_host, 100);
 
-function test_password(username, password, host)
+function test_password(username, host, password)
 	return hosts[host].users.test_password(username, password);
 end
 
@@ -75,8 +79,8 @@ 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 get_sasl_handler(host)
+	return hosts[host].users.get_sasl_handler();
 end
 
 function get_provider(host)
@@ -84,20 +88,44 @@ 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
+	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");
+	
+	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
+					is_admin = true;
+					break;
+				end
 			end
-		elseif admins then
-			log("error", "Option 'admins' for host '%s' is not a table", host);
+		elseif host_admins then
+			log("error", "Option 'admins' for host '%s' is not a list", host);
 		end
-		return nil;
 	end
+	
+	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
+					is_admin = true;
+					break;
+				end
+			end
+		elseif global_admins then
+			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.is_admin then
+		is_admin = hosts[host].users.is_admin(jid);
+	end
+	return is_admin or false;
 end
 
 return _M;