Merge 0.9->0.10

[prosody.git] / util / xmppstream.lua

diff --git a/util/xmppstream.lua b/util/xmppstream.lua
index 0f80742dc706d693dd4785e7738952a2b2a4dbd3..550170c94c75d96118cf023be0fe9bcfaeaf093c 100644 (file)
--- a/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -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";
@@ -39,21 +42,21 @@ _M.ns_pattern = ns_pattern;
 
 function new_sax_handlers(session, stream_callbacks)
        local xml_handlers = {};
-       
+
        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;
+       local cb_error = stream_callbacks.error or function(session, e, stanza) error("XML stream error: "..tostring(e)..(stanza and ": "..tostring(stanza) or ""),2); end;
        local cb_handlestanza = stream_callbacks.handlestanza;
-       
+
        local stream_ns = stream_callbacks.stream_ns or xmlns_streams;
        local stream_tag = stream_callbacks.stream_tag or "stream";
        if stream_ns ~= "" then
                stream_tag = stream_ns..ns_separator..stream_tag;
        end
        local stream_error_tag = stream_ns..ns_separator..(stream_callbacks.error_tag or "error");
-       
+
        local stream_default_ns = stream_callbacks.default_ns;
-       
+
        local stack = {};
        local chardata, stanza = {};
        local non_streamns_depth = 0;
@@ -72,21 +75,17 @@ function new_sax_handlers(session, stream_callbacks)
                        attr.xmlns = curr_ns;
                        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
-               
+
                if not stanza then --if we are not currently inside a stanza
                        if session.notopen then
                                if tagname == stream_tag then
@@ -103,7 +102,7 @@ function new_sax_handlers(session, stream_callbacks)
                        if curr_ns == "jabber:client" and name ~= "iq" and name ~= "presence" and name ~= "message" then
                                cb_error(session, "invalid-top-level-element");
                        end
-                       
+
                        stanza = setmetatable({ name = name, attr = attr, tags = {} }, stanza_mt);
                else -- we are inside a stanza, so add a tag
                        t_insert(stack, stanza);
@@ -140,19 +139,9 @@ 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
-                       stanza, chardata = nil, {};
-                       stack = {};
                end
        end
 
@@ -162,22 +151,22 @@ function new_sax_handlers(session, stream_callbacks)
                        error("Failed to abort parsing");
                end
        end
-       
+
        if lxp_supports_doctype then
                xml_handlers.StartDoctypeDecl = restricted_handler;
        end
        xml_handlers.Comment = restricted_handler;
        xml_handlers.ProcessingInstruction = restricted_handler;
-       
+
        local function reset()
                stanza, chardata = nil, {};
                stack = {};
        end
-       
+
        local function set_session(stream, new_session)
                session = new_session;
        end
-       
+
        return xml_handlers, { reset = reset, set_session = set_session };
 end