Working defaultauth

2 files changed, 30 insertions, 14 deletions

diff --git a/core/usermanager.lua b/core/usermanager.lua
index 6d43dca9..74e8fd6e 100644
--- a/core/usermanager.lua
+++ b/core/usermanager.lua
@@ -30,23 +30,37 @@ function new_null_provider()
 end
 
 local function host_handler(host)
+        log("debug", "host_handler called with host '%s'", host);
 	local host_session = hosts[host];
-	host_session.events.add_handler("item-added/auth-provider", function (provider)
-	        log("debug", "authentication provider = '%s'", config.get(host, "core", "authentication"));
-		if config.get(host, "core", "authentication") == provider.name then
+	host_session.events.add_handler("item-added/auth-provider", function (event)
+		local provider = event.item;
+		if provider == nil then
+			log("debug", "auth provider is nil");
+		else
+			log("debug", "auth provider is not nil");
+		end
+		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
 			host_session.users = provider;
 		end
+		if provider.name == nil then
+			log("debug", "authentication provider name is nil");
+		else
+	        	log("debug", "authentication provider name = '%s'", provider.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_null_provider();
 		end
 	end);
 end
-prosody.events.add_handler("host-activated", host_handler);
-prosody.events.add_handler("component-activated", host_handler);
+prosody.events.add_handler("host-activated", host_handler, 100);
+prosody.events.add_handler("component-activated", host_handler, 100);
 
-local function is_cyrus(host) return config.get(host, "core", "sasl_backend") == "cyrus"; end
+function is_cyrus(host) return config.get(host, "core", "sasl_backend") == "cyrus"; end
 
 function validate_credentials(host, username, password, method)
 	return hosts[host].users.test_password(username, password);
@@ -89,6 +103,4 @@ function is_admin(jid, host)
 	end
 end
 
-_M.new_default_provider = new_default_provider;
-
 return _M;
diff --git a/plugins/mod_auth_default.lua b/plugins/mod_defaultauth.lua
index 6151b6c1..6782ae09 100644
--- a/plugins/mod_auth_default.lua
+++ b/plugins/mod_defaultauth.lua
@@ -15,15 +15,19 @@ local ipairs = ipairs;
 local hashes = require "util.hashes";
 local jid_bare = require "util.jid".bare;
 local config = require "core.configmanager";
+local usermanager = require "core.usermanager";
 local hosts = hosts;
 
 local prosody = _G.prosody;
 
+local is_cyrus = usermanager.is_cyrus;
+
 function new_default_provider(host)
 	local provider = { name = "default" };
-	
+	log("debug", "initializing default authentication provider for host '%s'", host);
+
 	function provider.test_password(username, password)
-		log("debug", "test password for user %s at host %s", username, host);
+		log("debug", "test password '%s' for user %s at host %s", password, username, module.host);
 		if is_cyrus(host) then return nil, "Legacy auth not supported with Cyrus SASL."; end
 		local credentials = datamanager.load(username, host, "accounts") or {};
 	
@@ -35,7 +39,7 @@ function new_default_provider(host)
 	end
 
 	function provider.get_password(username)
-		log("debug", "get password for user %s at host %s", username, host);
+		log("debug", "get_password for username '%s' at host '%s'", username, module.host);
 		if is_cyrus(host) then return nil, "Passwords unavailable for Cyrus SASL."; end
 		return (datamanager.load(username, host, "accounts") or {}).password;
 	end
@@ -54,11 +58,11 @@ function new_default_provider(host)
 		if is_cyrus(host) then return true; end
 		local account = datamanager.load(username, host, "accounts");
 		if not account then
-			log("debug", "account not found for username '%s' at host '%s'", username, host);
+			log("debug", "account not found for username '%s' at host '%s'", username, module.host);
 			return nil, "Auth failed. Invalid username";
 		end
 		if account.password == nil or string.len(account.password) == 0 then
-			log("debug", "account password not set or zero-length for username '%s' at host '%s'", username, host);
+			log("debug", "account password not set or zero-length for username '%s' at host '%s'", username, module.host);
 			return nil, "Auth failed. Password invalid.";
 		end
 		return true;