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

mod_auth_{internal_plain,cyrus,anonymous}: Get rid of useless wrapper function new_default_provider.

Browse source
This commit is contained in:
Waqas Hussain 2012-09-12 21:32:12 +05:00
parent d617081ac4
commit e7c19c5cb6
3 changed files with 127 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/mod_auth_anonymous.lua
View file

@ -9,7 +9,7 @@
local new_sasl = require "util.sasl".new; local new_sasl = require "util.sasl".new;
local datamanager = require "util.datamanager"; local datamanager = require "util.datamanager";
function new_default_provider(host) -- define auth provider
local provider = { name = "anonymous" }; local provider = { name = "anonymous" };
function provider.test_password(username, password) function provider.test_password(username, password)
@ -41,9 +41,7 @@ function new_default_provider(host)
return new_sasl(module.host, anonymous_authentication_profile); return new_sasl(module.host, anonymous_authentication_profile);
end end
return provider; -- datamanager callback to disable writes
end
local function dm_callback(username, host, datastore, data) local function dm_callback(username, host, datastore, data)
if host == module.host then if host == module.host then
return false; return false;
@ -64,5 +62,5 @@ function module.unload()
datamanager.remove_callback(dm_callback); datamanager.remove_callback(dm_callback);
end end
module:add_item("auth-provider", new_default_provider(module.host)); module:add_item("auth-provider", provider);

15
plugins/mod_auth_cyrus.lua
View file

@ -41,7 +41,9 @@ do -- diagnostic
end end
end end
function new_default_provider(host) local host = module.host;
-- define auth provider
local provider = { name = "cyrus" }; local provider = { name = "cyrus" };
log("debug", "initializing default authentication provider for host '%s'", host); log("debug", "initializing default authentication provider for host '%s'", host);
@ -59,7 +61,7 @@ function new_default_provider(host)
function provider.user_exists(username) function provider.user_exists(username)
if require_provisioning then if require_provisioning then
return usermanager_user_exists(username, module.host); return usermanager_user_exists(username, host);
end end
return true; return true;
end end
@ -69,17 +71,14 @@ function new_default_provider(host)
end end
function provider.get_sasl_handler() function provider.get_sasl_handler()
local handler = new_sasl(module.host); local handler = new_sasl(host);
if require_provisioning then if require_provisioning then
function handler.require_provisioning(username) function handler.require_provisioning(username)
return usermanager_user_exists(username, module.host); return usermanager_user_exists(username, host);
end end
end end
return handler; return handler;
end end
return provider; module:add_item("auth-provider", provider);
end
module:add_item("auth-provider", new_default_provider(module.host));

16
plugins/mod_auth_internal_plain.lua
View file

@ -12,13 +12,14 @@ local new_sasl = require "util.sasl".new;
local nodeprep = require "util.encodings".stringprep.nodeprep; local nodeprep = require "util.encodings".stringprep.nodeprep;
local log = module._log; local log = module._log;
local host = module.host;
function new_default_provider(host) -- define auth provider
local provider = { name = "internal_plain" }; local provider = { name = "internal_plain" };
log("debug", "initializing internal_plain authentication provider for host '%s'", host); log("debug", "initializing internal_plain authentication provider for host '%s'", host);
function provider.test_password(username, password) function provider.test_password(username, password)
log("debug", "test password '%s' for user %s at host %s", password, username, module.host); log("debug", "test password '%s' for user %s at host %s", password, username, host);
local credentials = datamanager.load(username, host, "accounts") or {}; local credentials = datamanager.load(username, host, "accounts") or {};
if password == credentials.password then if password == credentials.password then
@ -29,7 +30,7 @@ function new_default_provider(host)
end end
function provider.get_password(username) function provider.get_password(username)
log("debug", "get_password for username '%s' at host '%s'", username, module.host); log("debug", "get_password for username '%s' at host '%s'", username, host);
return (datamanager.load(username, host, "accounts") or {}).password; return (datamanager.load(username, host, "accounts") or {}).password;
end end
@ -45,7 +46,7 @@ function new_default_provider(host)
function provider.user_exists(username) function provider.user_exists(username)
local account = datamanager.load(username, host, "accounts"); local account = datamanager.load(username, host, "accounts");
if not account then if not account then
log("debug", "account not found for username '%s' at host '%s'", username, module.host); log("debug", "account not found for username '%s' at host '%s'", username, host);
return nil, "Auth failed. Invalid username"; return nil, "Auth failed. Invalid username";
end end
return true; return true;
@ -74,11 +75,8 @@ function new_default_provider(host)
return password, true; return password, true;
end end
}; };
return new_sasl(module.host, getpass_authentication_profile); return new_sasl(host, getpass_authentication_profile);
end end
return provider; module:add_item("auth-provider", provider);
end
module:add_item("auth-provider", new_default_provider(module.host));