diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-08-20 13:57:50 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-08-20 13:57:50 +0100 |
| commit | 1e74c0bf848fb822c173b64adfda75c7ce098ce9 (patch) | |
| tree | 69218a99c857530054d6f7f86a8bba686938b158 /util/sasl.lua | |
| parent | 20d9c7ea6df498f5ee32533c5c3fd347bfafda42 (diff) | |
| parent | 7f7d80a4e808d80f0f0f92dd965b5a4f8dfa051a (diff) | |
| download | prosody-1e74c0bf848fb822c173b64adfda75c7ce098ce9.tar.gz prosody-1e74c0bf848fb822c173b64adfda75c7ce098ce9.zip | |
Uncertain merge with 0.5's SASL
Diffstat (limited to 'util/sasl.lua')
| -rw-r--r-- | util/sasl.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/util/sasl.lua b/util/sasl.lua index 444d4cf4..d176fd85 100644 --- a/util/sasl.lua +++ b/util/sasl.lua @@ -38,9 +38,9 @@ local function new_plain(realm, credentials_handler) function object.feed(self, message) if message == "" or message == nil then return "failure", "malformed-request" end local response = message - local authorization = s_match(response, "([^&%z]+)") - local authentication = s_match(response, "%z([^&%z]+)%z") - local password = s_match(response, "%z[^&%z]+%z([^&%z]+)") + local authorization = s_match(response, "([^%z]+)") + local authentication = s_match(response, "%z([^%z]+)%z") + local password = s_match(response, "%z[^%z]+%z([^%z]+)") if authentication == nil or password == nil then return "failure", "malformed-request" end self.username = authentication @@ -128,7 +128,7 @@ local function new_digest_md5(realm, credentials_handler) return t_concat(p); end local function parse(data) - message = {} + local message = {} for k, v in gmatch(data, [[([%w%-]+)="?([^",]*)"?,?]]) do -- FIXME The hacky regex makes me shudder message[k] = v; end |