mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 22:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename mod_defaultauth -> mod_auth_internal, mod_hashpassauth -> mod_auth_internal_hashed, and the providers to internal and internal_hashed respectively. Also no longer auto-load defaultauth, but instead auto-load the plugin selected for each host at startup based on the provider name.

Browse source
This commit is contained in:
Matthew Wild 2010-06-04 14:33:36 +01:00
parent c294b198d3
commit 3846f08f09
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/modulemanager.lua
View file

@ -39,7 +39,7 @@ end
local array, set = require "util.array", require "util.set";
local autoload_modules = {"presence", "message", "iq", "defaultauth"};
local autoload_modules = {"presence", "message", "iq"};
-- We need this to let modules access the real global namespace
local _G = _G;

12
core/usermanager.lua
View file

@ -7,6 +7,7 @@
--
local datamanager = require "util.datamanager";
local modulemanager = require "core.modulemanager";
local log = require "util.logger".init("usermanager");
local type = type;
local error = error;
@ -22,6 +23,8 @@ local prosody = _G.prosody;
local setmetatable = setmetatable;
local default_provider = "internal";
module "usermanager"
function new_null_provider()
@ -33,9 +36,8 @@ local function host_handler(host)
local host_session = hosts[host];
host_session.events.add_handler("item-added/auth-provider", function (event)
local provider = event.item;
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
local auth_provider = config.get(host, "core", "authentication") or default_provider;
if provider.name == auth_provider then
host_session.users = provider;
end
if host_session.users ~= nil and host_session.users.name ~= nil then
@ -49,6 +51,10 @@ local function host_handler(host)
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
end;
prosody.events.add_handler("host-activated", host_handler, 100);
prosody.events.add_handler("component-activated", host_handler, 100);

2
plugins/mod_defaultauth.lua → plugins/mod_auth_internal.lua
View file

@ -23,7 +23,7 @@ local prosody = _G.prosody;
local is_cyrus = usermanager.is_cyrus;
function new_default_provider(host)
local provider = { name = "default" };
local provider = { name = "internal" };
log("debug", "initializing default authentication provider for host '%s'", host);
function provider.test_password(username, password)

2
plugins/mod_hashpassauth.lua → plugins/mod_auth_internal_hashed.lua
View file

@ -28,7 +28,7 @@ local is_cyrus = usermanager.is_cyrus;
local iteration_count = 4096;
function new_hashpass_provider(host)
local provider = { name = "hashpass" };
local provider = { name = "internal_hashed" };
log("debug", "initializing hashpass authentication provider for host '%s'", host);
function provider.test_password(username, password)