aboutsummaryrefslogtreecommitdiffstats
path: root/util/sasl/digest-md5.lua
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2013-01-22 08:21:05 +0500
committerWaqas Hussain <waqas20@gmail.com>2013-01-22 08:21:05 +0500
commitc0d4c641f38d6232df69ee902b3dcf4ae145bc15 (patch)
treef10ba62ad7fbaef94033ed95e2eec8c934edd993 /util/sasl/digest-md5.lua
parent2eddb12845d284554677ac9bfb79edf545f32a74 (diff)
downloadprosody-c0d4c641f38d6232df69ee902b3dcf4ae145bc15.tar.gz
prosody-c0d4c641f38d6232df69ee902b3dcf4ae145bc15.zip
util.sasl.{plain,scram,digest-md5}: nodeprep username before passing to callbacks, so callbacks don't have to.
Diffstat (limited to 'util/sasl/digest-md5.lua')
-rw-r--r--util/sasl/digest-md5.lua11
1 files changed, 8 insertions, 3 deletions
diff --git a/util/sasl/digest-md5.lua b/util/sasl/digest-md5.lua
index de2538fc..591d8537 100644
--- a/util/sasl/digest-md5.lua
+++ b/util/sasl/digest-md5.lua
@@ -23,6 +23,7 @@ local to_byte, to_char = string.byte, string.char;
local md5 = require "util.hashes".md5;
local log = require "util.logger".init("sasl");
local generate_uuid = require "util.uuid".generate;
+local nodeprep = require "util.encodings".stringprep.nodeprep;
module "sasl.digest-md5"
@@ -139,10 +140,15 @@ local function digest(self, message)
end
-- check for username, it's REQUIRED by RFC 2831
- if not response["username"] then
+ local username = response["username"];
+ local _nodeprep = self.profile.nodeprep;
+ if username and _nodeprep ~= false then
+ username = (_nodeprep or nodeprep)(username); -- FIXME charset
+ end
+ if not username or username == "" then
return "failure", "malformed-request";
end
- self["username"] = response["username"];
+ self.username = username;
-- check for nonce, ...
if not response["nonce"] then
@@ -178,7 +184,6 @@ local function digest(self, message)
end
--TODO maybe realm support
- self.username = response["username"];
local Y, state;
if self.profile.plain then
local password, state = self.profile.plain(self, response["username"], self.realm)