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

util.sasl.*, mod_auth_*, mod_saslauth: Pass SASL handler as first parameter to SASL profile callbacks.

Browse source
This commit is contained in:
Waqas Hussain 2010-12-27 19:57:04 +05:00
parent a4d4abfeb7
commit aa144af70e
8 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/mod_auth_anonymous.lua
View file

@ -36,7 +36,7 @@ function new_default_provider(host)
function provider.get_sasl_handler() function provider.get_sasl_handler()
local realm = module:get_option("sasl_realm") or module.host; local realm = module:get_option("sasl_realm") or module.host;
local anonymous_authentication_profile = { local anonymous_authentication_profile = {
anonymous = function(username, realm) anonymous = function(sasl, username, realm)
return true; -- for normal usage you should always return true here return true; -- for normal usage you should always return true here
end end
}; };

4
plugins/mod_auth_internal_hashed.lua
View file

@ -138,7 +138,7 @@ function new_hashpass_provider(host)
function provider.get_sasl_handler() function provider.get_sasl_handler()
local realm = module:get_option("sasl_realm") or module.host; local realm = module:get_option("sasl_realm") or module.host;
local testpass_authentication_profile = { local testpass_authentication_profile = {
plain_test = function(username, password, realm) plain_test = function(sasl, username, password, realm)
local prepped_username = nodeprep(username); local prepped_username = nodeprep(username);
if not prepped_username then if not prepped_username then
log("debug", "NODEprep failed on username: %s", username); log("debug", "NODEprep failed on username: %s", username);
@ -146,7 +146,7 @@ function new_hashpass_provider(host)
end end
return usermanager.test_password(prepped_username, realm, password), true; return usermanager.test_password(prepped_username, realm, password), true;
end, end,
scram_sha_1 = function(username, realm) scram_sha_1 = function(sasl, username, realm)
local credentials = datamanager.load(username, host, "accounts"); local credentials = datamanager.load(username, host, "accounts");
if not credentials then return; end if not credentials then return; end
if credentials.password then if credentials.password then

2
plugins/mod_auth_internal_plain.lua
View file

@ -66,7 +66,7 @@ function new_default_provider(host)
function provider.get_sasl_handler() function provider.get_sasl_handler()
local realm = module:get_option("sasl_realm") or module.host; local realm = module:get_option("sasl_realm") or module.host;
local getpass_authentication_profile = { local getpass_authentication_profile = {
plain = function(username, realm) plain = function(sasl, username, realm)
local prepped_username = nodeprep(username); local prepped_username = nodeprep(username);
if not prepped_username then if not prepped_username then
log("debug", "NODEprep failed on username: %s", username); log("debug", "NODEprep failed on username: %s", username);

2
plugins/mod_saslauth.lua
View file

@ -34,7 +34,7 @@ local xmlns_stanzas ='urn:ietf:params:xml:ns:xmpp-stanzas';
local new_sasl = require "util.sasl".new; local new_sasl = require "util.sasl".new;
local anonymous_authentication_profile = { local anonymous_authentication_profile = {
anonymous = function(username, realm) anonymous = function(sasl, username, realm)
return true; -- for normal usage you should always return true here return true; -- for normal usage you should always return true here
end end
}; };

2
util/sasl/anonymous.lua
View file

@ -34,7 +34,7 @@ local function anonymous(self, message)
local username; local username;
repeat repeat
username = generate_uuid(); username = generate_uuid();
until self.profile.anonymous(username, self.realm); until self.profile.anonymous(self, username, self.realm);
self.username = username; self.username = username;
return "success" return "success"
end end

4
util/sasl/digest-md5.lua
View file

@ -181,12 +181,12 @@ local function digest(self, message)
self.username = response["username"]; self.username = response["username"];
local Y, state; local Y, state;
if self.profile.plain then if self.profile.plain then
local password, state = self.profile.plain(response["username"], self.realm) local password, state = self.profile.plain(self, response["username"], self.realm)
if state == nil then return "failure", "not-authorized" if state == nil then return "failure", "not-authorized"
elseif state == false then return "failure", "account-disabled" end elseif state == false then return "failure", "account-disabled" end
Y = md5(response["username"]..":"..response["realm"]..":"..password); Y = md5(response["username"]..":"..response["realm"]..":"..password);
elseif self.profile["digest-md5"] then elseif self.profile["digest-md5"] then
Y, state = self.profile["digest-md5"](response["username"], self.realm, response["realm"], response["charset"]) Y, state = self.profile["digest-md5"](self, response["username"], self.realm, response["realm"], response["charset"])
if state == nil then return "failure", "not-authorized" if state == nil then return "failure", "not-authorized"
elseif state == false then return "failure", "account-disabled" end elseif state == false then return "failure", "account-disabled" end
elseif self.profile["digest-md5-test"] then elseif self.profile["digest-md5-test"] then

4
util/sasl/plain.lua
View file

@ -57,10 +57,10 @@ local function plain(self, message)
local correct, state = false, false; local correct, state = false, false;
if self.profile.plain then if self.profile.plain then
local correct_password; local correct_password;
correct_password, state = self.profile.plain(authentication, self.realm); correct_password, state = self.profile.plain(self, authentication, self.realm);
correct = (correct_password == password); correct = (correct_password == password);
elseif self.profile.plain_test then elseif self.profile.plain_test then
correct, state = self.profile.plain_test(authentication, password, self.realm); correct, state = self.profile.plain_test(self, authentication, password, self.realm);
end end
self.username = authentication self.username = authentication

4
util/sasl/scram.lua
View file

@ -143,7 +143,7 @@ local function scram_gen(hash_name, H_f, HMAC_f)
-- retreive credentials -- retreive credentials
if self.profile.plain then if self.profile.plain then
local password, state = self.profile.plain(self.state.name, self.realm) local password, state = self.profile.plain(self, self.state.name, self.realm)
if state == nil then return "failure", "not-authorized" if state == nil then return "failure", "not-authorized"
elseif state == false then return "failure", "account-disabled" end elseif state == false then return "failure", "account-disabled" end
@ -163,7 +163,7 @@ local function scram_gen(hash_name, H_f, HMAC_f)
return "failure", "temporary-auth-failure"; return "failure", "temporary-auth-failure";
end end
elseif self.profile["scram_"..hashprep(hash_name)] then elseif self.profile["scram_"..hashprep(hash_name)] then
local stored_key, server_key, iteration_count, salt, state = self.profile["scram_"..hashprep(hash_name)](self.state.name, self.realm); local stored_key, server_key, iteration_count, salt, state = self.profile["scram_"..hashprep(hash_name)](self, self.state.name, self.realm);
if state == nil then return "failure", "not-authorized" if state == nil then return "failure", "not-authorized"
elseif state == false then return "failure", "account-disabled" end elseif state == false then return "failure", "account-disabled" end