X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fusermanager.lua;h=4ac288a479deeba93cdf7a2fcd3989168d7b00ef;hb=8bb2078fbc4e0db14429616a71d17dec966a749a;hp=e46546987af3317bdadb8a0e1a635154305cd2f7;hpb=a3d2f0983c3fd936a311df0ea0c2e21b05246e7d;p=prosody.git

diff --git a/core/usermanager.lua b/core/usermanager.lua
index e4654698..4ac288a4 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -6,105 +6,69 @@
 -- 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 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_plain";
+
 module "usermanager"
 
-local new_default_provider;
+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
+	});
+end
+
+local provider_mt = { __index = new_null_provider() };
 
-local function host_handler(host)
+function initialize_host(host)
 	local host_session = hosts[host];
-	host_session.events.add_handler("item-added/auth-provider", function (provider)
-		if config.get(host, "core", "authentication") == provider.name then
-			host_session.users = provider;
+	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, "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 = 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);
 		end
 	end);
-	host_session.events.add_handler("item-removed/auth-provider", function (provider)
+	host_session.events.add_handler("item-removed/auth-provider", function (event)
+		local provider = event.item;
 		if host_session.users == provider then
-			host_session.users = new_default_provider(host);
+			host_session.users = new_null_provider();
 		end
 	end);
-	host_session.users = new_default_provider(host); -- Start with the default usermanager provider
-end
-prosody.events.add_handler("host-activated", host_handler);
-prosody.events.add_handler("component-activated", host_handler);
-
-local function is_cyrus(host) return config.get(host, "core", "sasl_backend") == "cyrus"; end
-
-function new_default_provider(host)
-	local provider = { name = "default" };
-	
-	function provider.test_password(username, password)
-		if is_cyrus(host) then return nil, "Legacy auth not supported with Cyrus SASL."; end
-		local credentials = datamanager.load(username, host, "accounts") or {};
-	
-		if password == credentials.password then
-			return true;
-		else
-			return nil, "Auth failed. Invalid username or password.";
-		end
-	end
-
-	function provider.get_password(username)
-		if is_cyrus(host) then return nil, "Passwords unavailable for Cyrus SASL."; end
-		return (datamanager.load(username, host, "accounts") or {}).password;
-	end
-	
-	function provider.set_password(username, password)
-		if is_cyrus(host) then return nil, "Passwords unavailable for Cyrus SASL."; end
-		local account = datamanager.load(username, host, "accounts");
-		if account then
-			account.password = password;
-			return datamanager.store(username, host, "accounts", account);
-		end
-		return nil, "Account not available.";
-	end
-
-	function provider.user_exists(username)
-		if not(require_provisioning) and is_cyrus(host) then return true; end
-		local account, err = datamanager.load(username, host, "accounts") ~= nil; -- FIXME also check for empty credentials
-		return (account or err) ~= nil; -- FIXME also check for empty credentials
-	end
-
-	function provider.create_user(username, password)
-		if not(require_provisioning) and is_cyrus(host) then return nil, "Account creation/modification not available with Cyrus SASL."; end
-		return datamanager.store(username, host, "accounts", {password = password});
-	end
-
-	function provider.get_supported_methods()
-		return {["PLAIN"] = true, ["DIGEST-MD5"] = true}; -- TODO this should be taken from the config
+	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", initialize_host, 100);
 
-	function provider.is_admin(jid)
-		local admins = config.get(host, "core", "admins");
-		if admins ~= config.get("*", "core", "admins") then
-			if type(admins) == "table" then
-				jid = jid_bare(jid);
-				for _,admin in ipairs(admins) do
-					if admin == jid then return true; end
-				end
-			elseif admins then
-				log("error", "Option 'admins' for host '%s' is not a table", host);
-			end
-		end
-		return is_admin(jid); -- Test whether it's a global admin instead
-	end
-	return provider;
-end
-
-function validate_credentials(host, username, password, method)
+function test_password(username, host, password)
 	return hosts[host].users.test_password(username, password);
 end
 
@@ -112,7 +76,7 @@ function get_password(username, host)
 	return hosts[host].users.get_password(username);
 end
 
-function set_password(username, host, password)
+function set_password(username, password, host)
 	return hosts[host].users.set_password(username, password);
 end
 
@@ -124,27 +88,67 @@ 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)
+	return hosts[host].users;
 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 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
-end
 
-_M.new_default_provider = new_default_provider;
+	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 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;