diff options
| author | Tobias Markmann <tm@ayena.de> | 2009-06-20 22:19:24 +0200 |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2009-06-20 22:19:24 +0200 |
| commit | f5a6ea54cf8b7ed92185326def5af3c14058da96 (patch) | |
| tree | 6dff74da7dfa3aa17cd1923d2ff5c53a48d2f6f1 | |
| parent | 968abac4691ef34b3238f2f8079bd3fc91da28ce (diff) | |
| download | prosody-f5a6ea54cf8b7ed92185326def5af3c14058da96.tar.gz prosody-f5a6ea54cf8b7ed92185326def5af3c14058da96.zip | |
Adjust PLAIN and DIGEST-MD5 mechanisms to new password_handler API.
| -rw-r--r-- | util/sasl.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/util/sasl.lua b/util/sasl.lua index 11a25f3a..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,7 +199,7 @@ 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 = ""; |