From 0c22db44a1d07c7e7d5683ab65f03e6883631521 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Tue, 22 Nov 2011 01:44:28 +0500 Subject: util.xmppstream: A little cleanup. --- util/xmppstream.lua | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'util/xmppstream.lua') diff --git a/util/xmppstream.lua b/util/xmppstream.lua index e5271b72..018f238d 100644 --- a/util/xmppstream.lua +++ b/util/xmppstream.lua @@ -11,26 +11,23 @@ local lxp = require "lxp"; local st = require "util.stanza"; local stanza_mt = st.stanza_mt; +local error = error; local tostring = tostring; local t_insert = table.insert; local t_concat = table.concat; local t_remove = table.remove; local setmetatable = setmetatable; -local default_log = require "util.logger".init("xmppstream"); - -- COMPAT: w/LuaExpat 1.1.0 local lxp_supports_doctype = pcall(lxp.new, { StartDoctypeDecl = false }); - if not lxp_supports_doctype then + local default_log = require "util.logger".init("xmppstream"); default_log("warn", "The version of LuaExpat on your system leaves Prosody " .."vulnerable to denial-of-service attacks. You should upgrade to " .."LuaExpat 1.1.1 or higher as soon as possible. See " .."http://prosody.im/doc/depends#luaexpat for more information."); end -local error = error; - module "xmppstream" local new_parser = lxp.new; @@ -50,8 +47,6 @@ _M.ns_pattern = ns_pattern; function new_sax_handlers(session, stream_callbacks) local xml_handlers = {}; - local log = session.log or default_log; - local cb_streamopened = stream_callbacks.streamopened; local cb_streamclosed = stream_callbacks.streamclosed; local cb_error = stream_callbacks.error or function(session, e) error("XML stream error: "..tostring(e)); end; @@ -188,7 +183,6 @@ function new_sax_handlers(session, stream_callbacks) local function set_session(stream, new_session) session = new_session; - log = new_session.log or default_log; end return xml_handlers, { reset = reset, set_session = set_session }; -- cgit v1.2.3 From 56975d6c639e95c6cb489768ebb065425a6bee7b Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Tue, 22 Nov 2011 02:13:42 +0500 Subject: util.dependencies, util.xmppstream: Move LuaExpat version checking to util.dependencies. --- util/xmppstream.lua | 7 ------- 1 file changed, 7 deletions(-) (limited to 'util/xmppstream.lua') diff --git a/util/xmppstream.lua b/util/xmppstream.lua index 018f238d..0f80742d 100644 --- a/util/xmppstream.lua +++ b/util/xmppstream.lua @@ -20,13 +20,6 @@ local setmetatable = setmetatable; -- COMPAT: w/LuaExpat 1.1.0 local lxp_supports_doctype = pcall(lxp.new, { StartDoctypeDecl = false }); -if not lxp_supports_doctype then - local default_log = require "util.logger".init("xmppstream"); - default_log("warn", "The version of LuaExpat on your system leaves Prosody " - .."vulnerable to denial-of-service attacks. You should upgrade to " - .."LuaExpat 1.1.1 or higher as soon as possible. See " - .."http://prosody.im/doc/depends#luaexpat for more information."); -end module "xmppstream" -- cgit v1.2.3 From 5b8670c951412d8ae46c95e39ac0cfb50a530947 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Wed, 25 Jan 2012 11:47:51 +0500 Subject: util.xmppstream: Remove some unnecessary code. --- util/xmppstream.lua | 2 -- 1 file changed, 2 deletions(-) (limited to 'util/xmppstream.lua') diff --git a/util/xmppstream.lua b/util/xmppstream.lua index 0f80742d..adf4a359 100644 --- a/util/xmppstream.lua +++ b/util/xmppstream.lua @@ -151,8 +151,6 @@ function new_sax_handlers(session, stream_callbacks) end cb_error(session, "parse-error", "unexpected-element-close", name); end - stanza, chardata = nil, {}; - stack = {}; end end -- cgit v1.2.3 From 36936e4b059694ccc4e4f9d9e2d63c0aec24bf60 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Wed, 25 Jan 2012 11:49:27 +0500 Subject: util.xmppstream: Have faith in the XML parser matching start and end tags. --- util/xmppstream.lua | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'util/xmppstream.lua') diff --git a/util/xmppstream.lua b/util/xmppstream.lua index adf4a359..09198f21 100644 --- a/util/xmppstream.lua +++ b/util/xmppstream.lua @@ -140,16 +140,8 @@ function new_sax_handlers(session, stream_callbacks) stanza = t_remove(stack); end else - if tagname == stream_tag then - if cb_streamclosed then - cb_streamclosed(session); - end - else - local curr_ns,name = tagname:match(ns_pattern); - if name == "" then - curr_ns, name = "", curr_ns; - end - cb_error(session, "parse-error", "unexpected-element-close", name); + if cb_streamclosed then + cb_streamclosed(session); end end end -- cgit v1.2.3 From 19bcbcde9c09abdad8fdeadf3758288e0ff76a12 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Wed, 25 Jan 2012 11:54:12 +0500 Subject: util.xmppstream: Optimize attribute processing. --- util/xmppstream.lua | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'util/xmppstream.lua') diff --git a/util/xmppstream.lua b/util/xmppstream.lua index 09198f21..f1793b4f 100644 --- a/util/xmppstream.lua +++ b/util/xmppstream.lua @@ -25,8 +25,11 @@ module "xmppstream" local new_parser = lxp.new; -local ns_prefixes = { - ["http://www.w3.org/XML/1998/namespace"] = "xml"; +local xml_namespace = { + ["http://www.w3.org/XML/1998/namespace\1lang"] = "xml:lang"; + ["http://www.w3.org/XML/1998/namespace\1space"] = "xml:space"; + ["http://www.w3.org/XML/1998/namespace\1base"] = "xml:base"; + ["http://www.w3.org/XML/1998/namespace\1id"] = "xml:id"; }; local xmlns_streams = "http://etherx.jabber.org/streams"; @@ -73,17 +76,13 @@ function new_sax_handlers(session, stream_callbacks) non_streamns_depth = non_streamns_depth + 1; end - -- FIXME !!!!! for i=1,#attr do local k = attr[i]; attr[i] = nil; - local ns, nm = k:match(ns_pattern); - if nm ~= "" then - ns = ns_prefixes[ns]; - if ns then - attr[ns..":"..nm] = attr[k]; - attr[k] = nil; - end + local xmlk = xml_namespace[k]; + if xmlk then + attr[xmlk] = attr[k]; + attr[k] = nil; end end -- cgit v1.2.3