aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2012-09-12 21:32:12 +0500
committerWaqas Hussain <waqas20@gmail.com>2012-09-12 21:32:12 +0500
commite7c19c5cb643dd6160e181cc8ff767a604c640b8 (patch)
tree7d75ac38c41e977b780b7c1987b1c767fce9b56c /plugins
parentd617081ac45113fdaa8fc0604bee29a08d4aefed (diff)
downloadprosody-e7c19c5cb643dd6160e181cc8ff767a604c640b8.tar.gz
prosody-e7c19c5cb643dd6160e181cc8ff767a604c640b8.zip
mod_auth_{internal_plain,cyrus,anonymous}: Get rid of useless wrapper function new_default_provider.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_auth_anonymous.lua54
-rw-r--r--plugins/mod_auth_cyrus.lua61
-rw-r--r--plugins/mod_auth_internal_plain.lua114
3 files changed, 112 insertions, 117 deletions
diff --git a/plugins/mod_auth_anonymous.lua b/plugins/mod_auth_anonymous.lua
index c080177d..761dc8a4 100644
--- a/plugins/mod_auth_anonymous.lua
+++ b/plugins/mod_auth_anonymous.lua
@@ -9,41 +9,39 @@
local new_sasl = require "util.sasl".new;
local datamanager = require "util.datamanager";
-function new_default_provider(host)
- local provider = { name = "anonymous" };
+-- define auth provider
+local provider = { name = "anonymous" };
- function provider.test_password(username, password)
- return nil, "Password based auth not supported.";
- end
-
- function provider.get_password(username)
- return nil, "Password not available.";
- end
+function provider.test_password(username, password)
+ return nil, "Password based auth not supported.";
+end
- function provider.set_password(username, password)
- return nil, "Password based auth not supported.";
- end
+function provider.get_password(username)
+ return nil, "Password not available.";
+end
- function provider.user_exists(username)
- return nil, "Only anonymous users are supported."; -- FIXME check if anonymous user is connected?
- end
+function provider.set_password(username, password)
+ return nil, "Password based auth not supported.";
+end
- function provider.create_user(username, password)
- return nil, "Account creation/modification not supported.";
- end
+function provider.user_exists(username)
+ return nil, "Only anonymous users are supported."; -- FIXME check if anonymous user is connected?
+end
- function provider.get_sasl_handler()
- local anonymous_authentication_profile = {
- anonymous = function(sasl, username, realm)
- return true; -- for normal usage you should always return true here
- end
- };
- return new_sasl(module.host, anonymous_authentication_profile);
- end
+function provider.create_user(username, password)
+ return nil, "Account creation/modification not supported.";
+end
- return provider;
+function provider.get_sasl_handler()
+ local anonymous_authentication_profile = {
+ anonymous = function(sasl, username, realm)
+ return true; -- for normal usage you should always return true here
+ end
+ };
+ return new_sasl(module.host, anonymous_authentication_profile);
end
+-- datamanager callback to disable writes
local function dm_callback(username, host, datastore, data)
if host == module.host then
return false;
@@ -64,5 +62,5 @@ function module.unload()
datamanager.remove_callback(dm_callback);
end
-module:add_item("auth-provider", new_default_provider(module.host));
+module:add_item("auth-provider", provider);
diff --git a/plugins/mod_auth_cyrus.lua b/plugins/mod_auth_cyrus.lua
index e4493f04..5ed124cc 100644
--- a/plugins/mod_auth_cyrus.lua
+++ b/plugins/mod_auth_cyrus.lua
@@ -41,45 +41,44 @@ do -- diagnostic
end
end
-function new_default_provider(host)
- local provider = { name = "cyrus" };
- log("debug", "initializing default authentication provider for host '%s'", host);
+local host = module.host;
- function provider.test_password(username, password)
- return nil, "Legacy auth not supported with Cyrus SASL.";
- end
+-- define auth provider
+local provider = { name = "cyrus" };
+log("debug", "initializing default authentication provider for host '%s'", host);
- function provider.get_password(username)
- return nil, "Passwords unavailable for Cyrus SASL.";
- end
-
- function provider.set_password(username, password)
- return nil, "Passwords unavailable for Cyrus SASL.";
- end
+function provider.test_password(username, password)
+ return nil, "Legacy auth not supported with Cyrus SASL.";
+end
- function provider.user_exists(username)
- if require_provisioning then
- return usermanager_user_exists(username, module.host);
- end
- return true;
- end
+function provider.get_password(username)
+ return nil, "Passwords unavailable for Cyrus SASL.";
+end
- function provider.create_user(username, password)
- return nil, "Account creation/modification not available with Cyrus SASL.";
+function provider.set_password(username, password)
+ return nil, "Passwords unavailable for Cyrus SASL.";
+end
+
+function provider.user_exists(username)
+ if require_provisioning then
+ return usermanager_user_exists(username, host);
end
+ return true;
+end
- function provider.get_sasl_handler()
- local handler = new_sasl(module.host);
- if require_provisioning then
- function handler.require_provisioning(username)
- return usermanager_user_exists(username, module.host);
- end
+function provider.create_user(username, password)
+ return nil, "Account creation/modification not available with Cyrus SASL.";
+end
+
+function provider.get_sasl_handler()
+ local handler = new_sasl(host);
+ if require_provisioning then
+ function handler.require_provisioning(username)
+ return usermanager_user_exists(username, host);
end
- return handler;
end
-
- return provider;
+ return handler;
end
-module:add_item("auth-provider", new_default_provider(module.host));
+module:add_item("auth-provider", provider);
diff --git a/plugins/mod_auth_internal_plain.lua b/plugins/mod_auth_internal_plain.lua
index 89dd7f1b..7705cb66 100644
--- a/plugins/mod_auth_internal_plain.lua
+++ b/plugins/mod_auth_internal_plain.lua
@@ -12,73 +12,71 @@ local new_sasl = require "util.sasl".new;
local nodeprep = require "util.encodings".stringprep.nodeprep;
local log = module._log;
+local host = module.host;
-function new_default_provider(host)
- local provider = { name = "internal_plain" };
- log("debug", "initializing internal_plain authentication provider for host '%s'", host);
+-- define auth provider
+local provider = { name = "internal_plain" };
+log("debug", "initializing internal_plain authentication provider for host '%s'", host);
- function provider.test_password(username, password)
- log("debug", "test password '%s' for user %s at host %s", password, username, module.host);
- local credentials = datamanager.load(username, host, "accounts") or {};
-
- if password == credentials.password then
- return true;
- else
- return nil, "Auth failed. Invalid username or password.";
- end
- end
+function provider.test_password(username, password)
+ log("debug", "test password '%s' for user %s at host %s", password, username, host);
+ local credentials = datamanager.load(username, host, "accounts") or {};
- function provider.get_password(username)
- log("debug", "get_password for username '%s' at host '%s'", username, module.host);
- return (datamanager.load(username, host, "accounts") or {}).password;
- end
-
- function provider.set_password(username, password)
- local account = datamanager.load(username, host, "accounts");
- if account then
- account.password = password;
- return datamanager.store(username, host, "accounts", account);
- end
- return nil, "Account not available.";
- end
-
- function provider.user_exists(username)
- local account = datamanager.load(username, host, "accounts");
- if not account then
- log("debug", "account not found for username '%s' at host '%s'", username, module.host);
- return nil, "Auth failed. Invalid username";
- end
+ if password == credentials.password then
return true;
+ else
+ return nil, "Auth failed. Invalid username or password.";
end
+end
- function provider.create_user(username, password)
- return datamanager.store(username, host, "accounts", {password = password});
- end
-
- function provider.delete_user(username)
- return datamanager.store(username, host, "accounts", nil);
+function provider.get_password(username)
+ log("debug", "get_password for username '%s' at host '%s'", username, host);
+ return (datamanager.load(username, host, "accounts") or {}).password;
+end
+
+function provider.set_password(username, password)
+ local account = datamanager.load(username, host, "accounts");
+ if account then
+ account.password = password;
+ return datamanager.store(username, host, "accounts", account);
end
+ return nil, "Account not available.";
+end
- function provider.get_sasl_handler()
- local getpass_authentication_profile = {
- plain = function(sasl, username, realm)
- local prepped_username = nodeprep(username);
- if not prepped_username then
- log("debug", "NODEprep failed on username: %s", username);
- return "", nil;
- end
- local password = usermanager.get_password(prepped_username, realm);
- if not password then
- return "", nil;
- end
- return password, true;
- end
- };
- return new_sasl(module.host, getpass_authentication_profile);
+function provider.user_exists(username)
+ local account = datamanager.load(username, host, "accounts");
+ if not account then
+ log("debug", "account not found for username '%s' at host '%s'", username, host);
+ return nil, "Auth failed. Invalid username";
end
-
- return provider;
+ return true;
end
-module:add_item("auth-provider", new_default_provider(module.host));
+function provider.create_user(username, password)
+ return datamanager.store(username, host, "accounts", {password = password});
+end
+
+function provider.delete_user(username)
+ return datamanager.store(username, host, "accounts", nil);
+end
+
+function provider.get_sasl_handler()
+ local getpass_authentication_profile = {
+ plain = function(sasl, username, realm)
+ local prepped_username = nodeprep(username);
+ if not prepped_username then
+ log("debug", "NODEprep failed on username: %s", username);
+ return "", nil;
+ end
+ local password = usermanager.get_password(prepped_username, realm);
+ if not password then
+ return "", nil;
+ end
+ return password, true;
+ end
+ };
+ return new_sasl(host, getpass_authentication_profile);
+end
+
+module:add_item("auth-provider", provider);