aboutsummaryrefslogtreecommitdiffstats
path: root/util/sasl.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-06-20 22:50:38 +0100
committerMatthew Wild <mwild1@gmail.com>2009-06-20 22:50:38 +0100
commit0f51eb5fa1f49a1a094e291528bf954c63dfadfd (patch)
tree0cb3818beb12b4b9cdb4f49f58c27b00c9e4cef3 /util/sasl.lua
parent7d05900c4bbe9630cc1bb93f88ea57bf7ddedde2 (diff)
parentf5a6ea54cf8b7ed92185326def5af3c14058da96 (diff)
downloadprosody-0f51eb5fa1f49a1a094e291528bf954c63dfadfd.tar.gz
prosody-0f51eb5fa1f49a1a094e291528bf954c63dfadfd.zip
Merge with Tobias
Diffstat (limited to 'util/sasl.lua')
-rw-r--r--util/sasl.lua7
1 files changed, 4 insertions, 3 deletions
diff --git a/util/sasl.lua b/util/sasl.lua
index 7f023321..a343d608 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -41,7 +41,7 @@ local function new_plain(realm, password_handler)
if authentication == nil or password == nil then return "failure", "malformed-request" end
- local password_encoding, correct_password = self.password_handler(authentication, self.realm, "PLAIN")
+ local password_encoding, correct_password = self.password_handler(authentication, self.realm, self.realm, "PLAIN")
if correct_password == nil then return "failure", "not-authorized"
elseif correct_password == false then return "failure", "account-disabled" end
@@ -176,7 +176,7 @@ local function new_digest_md5(realm, password_handler)
if not response["qop"] then response["qop"] = "auth" end
if response["realm"] == nil or response["realm"] == "" then
- response["realm"] = self.realm;
+ response["realm"] = "";
elseif response["realm"] ~= self.realm then
return "failure", "not-authorized", "Incorrect realm value";
end
@@ -199,12 +199,13 @@ local function new_digest_md5(realm, password_handler)
--TODO maybe realm support
self.username = response["username"];
- local password_encoding, Y = self.password_handler(response["username"], response["realm"], "DIGEST-MD5", decoder)
+ local password_encoding, Y = self.password_handler(response["username"], domain, response["realm"], "DIGEST-MD5", decoder);
if Y == nil then return "failure", "not-authorized"
elseif Y == false then return "failure", "account-disabled" end
local A1 = "";
if response.authzid then
if response.authzid == self.username.."@"..self.realm then
+ -- COMPAT
log("warn", "Client is violating XMPP RFC. See section 6.1 of RFC 3920.");
A1 = Y..":"..response["nonce"]..":"..response["cnonce"]..":"..response.authzid;
else