diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2008-12-03 22:08:49 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2008-12-03 22:08:49 +0500 |
| commit | 7ec231373fcb0fb4448053ad4ea0c8d656b2cc4e (patch) | |
| tree | aca8df9a5d5858124ea5676dfdfcc6248b784ca1 | |
| parent | e9c064e355fee23eca94878748b4b182d1d625ac (diff) | |
| download | prosody-7ec231373fcb0fb4448053ad4ea0c8d656b2cc4e.tar.gz prosody-7ec231373fcb0fb4448053ad4ea0c8d656b2cc4e.zip | |
Fix for handling latin1 encoded hostnames in SASL
| -rw-r--r-- | plugins/mod_saslauth.lua | 4 | ||||
| -rw-r--r-- | util/sasl.lua | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index 7cb93c46..52ef68c7 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -64,14 +64,14 @@ local function handle_status(session, status) end end -local function password_callback(node, host, mechanism) +local function password_callback(node, host, mechanism, raw_host) local password = (datamanager.load(node, host, "accounts") or {}).password; -- FIXME handle hashed passwords local func = function(x) return x; end; if password then if mechanism == "PLAIN" then return func, password; elseif mechanism == "DIGEST-MD5" then - return func, md5(node..":"..host..":"..password); + return func, md5(node..":"..raw_host..":"..password); end end return func, nil; diff --git a/util/sasl.lua b/util/sasl.lua index 7983a3c2..ab8b814b 100644 --- a/util/sasl.lua +++ b/util/sasl.lua @@ -144,6 +144,7 @@ local function new_digest_md5(realm, password_handler) if not response["qop"] then response["qop"] = "auth" end if response["realm"] == nil then response["realm"] = "" end + local raw_realm = response["realm"]; if response["charset"] == nil then response["username"] = latin1toutf8(response["username"]) @@ -163,7 +164,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") + local password_encoding, Y = self.password_handler(response["username"], response["realm"], "DIGEST-MD5", raw_realm) if Y == nil then return "failure", "not-authorized" elseif Y == false then return "failure", "account-disabled" end |