X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fusermanager.lua;h=1aea0de9b86f6c1ad17519023b86cd9e8c20f9cb;hb=aa53318e7ca435fd45038557eb497b6514a6b995;hp=511ffc84567c038fc9cb3c07e34b57b7163b34c7;hpb=2603f25c8d5bb751aceb4f231edd756d2bd6e5dc;p=prosody.git

diff --git a/core/usermanager.lua b/core/usermanager.lua
index 511ffc84..1aea0de9 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -6,34 +6,33 @@
 -- 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 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";
+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_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];
+	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;
@@ -50,18 +49,15 @@ 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, "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);
+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
 
@@ -90,20 +86,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 and hosts[host].users.is_admin then
+		is_admin = hosts[host].users.is_admin(jid);
+	end
+	return is_admin or false;
 end
 
 return _M;