X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fusermanager.lua;h=5e2e41fcd31c72a53afc2de9d6e6f901d38188ec;hb=893e9d4df9981fa666c98c0f5dd04920ae91e955;hp=a369b9e0d41ec4077c89bee3e21a170aafffdc12;hpb=dc9faf773db971d00032bcb164d1765367675895;p=prosody.git

diff --git a/core/usermanager.lua b/core/usermanager.lua
index a369b9e0..5e2e41fc 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -6,39 +6,43 @@
 -- 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() 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;
+		if config.get(host, "core", "anonymous_login") then 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 +54,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, "core", "authentication") or default_provider;
+	if config.get(host, "core", "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,6 +83,10 @@ function create_user(username, password, host)
 	return hosts[host].users.create_user(username, password);
 end
 
+function delete_user(username, host)
+	return hosts[host].users.delete_user(username);
+end
+
 function get_sasl_handler(host)
 	return hosts[host].users.get_sasl_handler();
 end
@@ -105,7 +111,7 @@ function is_admin(jid, host)
 					break;
 				end
 			end
-		elseif admins then
+		elseif host_admins then
 			log("error", "Option 'admins' for host '%s' is not a list", host);
 		end
 	end
@@ -118,13 +124,13 @@ function is_admin(jid, host)
 					break;
 				end
 			end
-		elseif admins then
+		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
+	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;