mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for handling latin1 encoded hostnames in SASL

Browse source
This commit is contained in:
Waqas Hussain 2008-12-03 22:08:49 +05:00
parent e9c064e355
commit 7ec231373f
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/mod_saslauth.lua
View file

@ -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;

3
util/sasl.lua
View file

@ -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