diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2008-11-30 20:58:48 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2008-11-30 20:58:48 +0500 |
| commit | 8932fbc85ca4a43bba31099569bb579c6a803f22 (patch) | |
| tree | c8ba320df0c900f7fe2010b009a699b18c1e7965 /util | |
| parent | 939c5b324dba2fca9fdfe92cfee519c4a36a00ad (diff) | |
| download | prosody-8932fbc85ca4a43bba31099569bb579c6a803f22.tar.gz prosody-8932fbc85ca4a43bba31099569bb579c6a803f22.zip | |
Added function latin1toutf8 to sasl.lua, for processing non-utf8 responses
Diffstat (limited to 'util')
| -rw-r--r-- | util/sasl.lua | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/util/sasl.lua b/util/sasl.lua index fa818b9a..02d47719 100644 --- a/util/sasl.lua +++ b/util/sasl.lua @@ -4,6 +4,8 @@ local log = require "util.logger".init("sasl"); local tostring = tostring; local st = require "util.stanza"; local generate_uuid = require "util.uuid".generate; +local t_insert, t_concat = table.insert, table.concat; +local to_byte, to_char = string.byte, string.char; local s_match = string.match; local gmatch = string.gmatch local string = string @@ -66,6 +68,20 @@ local function new_digest_md5(realm, password_handler) return data end + local function latin1toutf8(str) + local p = {}; + for ch in gmatch(str, ".") do + ch = to_byte(ch); + if (ch < 0x80) then + t_insert(p, to_char(ch)); + elseif (ch < 0xC0) then + t_insert(p, to_char(0xC2, ch)); + else + t_insert(p, to_char(0xC3, ch - 64)); + end + end + return t_concat(p); + end local function parse(data) message = {} for k, v in gmatch(data, [[([%w%-]+)="?([^",]*)"?,?]]) do -- FIXME The hacky regex makes me shudder |