projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configmanager: Update Include and RunScript directives to support paths relative...
[prosody.git]
/
core
/
usermanager.lua
diff --git
a/core/usermanager.lua
b/core/usermanager.lua
index a369b9e0d41ec4077c89bee3e21a170aafffdc12..83de193f082eb4fed8fc51eef9912a87ba3f492c 100644
(file)
--- a/
core/usermanager.lua
+++ b/
core/usermanager.lua
@@
-16,23
+16,23
@@
local hashes = require "util.hashes";
local jid_bare = require "util.jid".bare;
local config = require "core.configmanager";
local hosts = hosts;
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 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;
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
end
-
local function host_handler
(host)
+
function initialize_host
(host)
local host_session = hosts[host];
host_session.events.add_handler("item-added/auth-provider", function (event)
local provider = event.item;
local host_session = hosts[host];
host_session.events.add_handler("item-added/auth-provider", function (event)
local provider = event.item;
@@
-50,18
+50,15
@@
local function host_handler(host)
host_session.users = new_null_provider();
end
end);
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;
end;
-prosody.events.add_handler("host-activated", host_handler, 100);
-prosody.events.add_handler("component-activated", host_handler, 100);
-
-function is_cyrus(host) return config.get(host, "core", "sasl_backend") == "cyrus"; end
+prosody.events.add_handler("host-activated", initialize_host, 100);
-function test_password(username,
password, host
)
+function test_password(username,
host, password
)
return hosts[host].users.test_password(username, password);
end
return hosts[host].users.test_password(username, password);
end
@@
-105,7
+102,7
@@
function is_admin(jid, host)
break;
end
end
break;
end
end
- elseif admins then
+ elseif
host_
admins then
log("error", "Option 'admins' for host '%s' is not a list", host);
end
end
log("error", "Option 'admins' for host '%s' is not a list", host);
end
end
@@
-118,7
+115,7
@@
function is_admin(jid, host)
break;
end
end
break;
end
end
- elseif admins then
+ elseif
global_
admins then
log("error", "Global option 'admins' is not a list");
end
end
log("error", "Global option 'admins' is not a list");
end
end