aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJeff Mitchell <jeff@jefferai.org>2010-05-20 18:06:21 -0400
committerJeff Mitchell <jeff@jefferai.org>2010-05-20 18:06:21 -0400
commit753e5f839b606fd3992678d5d7bb7d2916040e86 (patch)
tree5b7f52abf9c3ac3964c91625b477bb179a4938ef /core
parent35157928fba9e8b389bd07fa2f91b70105d053c6 (diff)
downloadprosody-753e5f839b606fd3992678d5d7bb7d2916040e86.tar.gz
prosody-753e5f839b606fd3992678d5d7bb7d2916040e86.zip
Working defaultauth
Diffstat (limited to 'core')
-rw-r--r--core/usermanager.lua30
1 files changed, 21 insertions, 9 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;