Software / code / prosody
Changeset
3186:b5f261123013
mod_auth_internal, mod_auth_internal_hashed: Updated to provide get_sasl_handler.
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Mon, 07 Jun 2010 02:33:40 +0500 |
| parents | 3185:09174a6e8366 |
| children | 3187:a475fbce1990 |
| files | plugins/mod_auth_internal.lua plugins/mod_auth_internal_hashed.lua |
| diffstat | 2 files changed, 34 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_auth_internal.lua Mon Jun 07 02:32:13 2010 +0500 +++ b/plugins/mod_auth_internal.lua Mon Jun 07 02:33:40 2010 +0500 @@ -16,6 +16,8 @@ local jid_bare = require "util.jid".bare; local config = require "core.configmanager"; local usermanager = require "core.usermanager"; +local new_sasl = require "util.sasl".new; +local nodeprep = require "util.encodings".stringprep.nodeprep; local hosts = hosts; local prosody = _G.prosody; @@ -73,8 +75,23 @@ return datamanager.store(username, host, "accounts", {password = password}); end - function provider.get_supported_methods() - return {["PLAIN"] = true, ["DIGEST-MD5"] = true}; -- TODO this should be taken from the config + function provider.get_sasl_handler() + local realm = module:get_option("sasl_realm") or origin.host; + local getpass_authentication_profile = { + plain = function(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(realm, getpass_authentication_profile); end function provider.is_admin(jid)
--- a/plugins/mod_auth_internal_hashed.lua Mon Jun 07 02:32:13 2010 +0500 +++ b/plugins/mod_auth_internal_hashed.lua Mon Jun 07 02:33:40 2010 +0500 @@ -18,6 +18,8 @@ local config = require "core.configmanager"; local usermanager = require "core.usermanager"; local generate_uuid = require "util.uuid".generate; +local new_sasl = require "util.sasl".new; +local nodeprep = require "util.encodings".stringprep.nodeprep; local hosts = hosts; local prosody = _G.prosody; @@ -105,8 +107,19 @@ return datamanager.store(username, host, "accounts", {hashpass = hexpass, salt = salt, iteration_count = iteration_count}); end - function provider.get_supported_methods() - return {["PLAIN"] = true}; -- TODO this should be taken from the config + function provider.get_sasl_handler() + local realm = module:get_option("sasl_realm") or origin.host; + local testpass_authentication_profile = { + plain_test = function(username, password, realm) + local prepped_username = nodeprep(username); + if not prepped_username then + log("debug", "NODEprep failed on username: %s", username); + return "", nil; + end + return usermanager.test_password(prepped_username, password, realm), true; + end + }; + return new_sasl(realm, testpass_authentication_profile); end function provider.is_admin(jid)
