Bumper commit for the new modulemanager API \o/ Updates all the modules, though some...

[prosody.git] / core / xmlhandlers.lua

diff --git a/core/xmlhandlers.lua b/core/xmlhandlers.lua
index ebc8f91db969a962d64a158bb469904ffb98de78..a97db8e91cc522732e312624653b4efb6e622c9f 100644 (file)
--- a/core/xmlhandlers.lua
+++ b/core/xmlhandlers.lua
@@ -1,9 +1,12 @@
 
-local sessionmanager_streamopened = require "core.sessionmanager".streamopened;
 require "util.stanza"
 
 local st = stanza;
 local tostring = tostring;
+local pairs = pairs;
+local ipairs = ipairs;
+local type = type;
+local print = print;
 local format = string.format;
 local m_random = math.random;
 local t_insert = table.insert;
@@ -12,21 +15,30 @@ local t_concat = table.concat;
 local t_concatall = function (t, sep) local tt = {}; for _, s in ipairs(t) do t_insert(tt, tostring(s)); end return t_concat(tt, sep); end
 local sm_destroy_session = import("core.sessionmanager", "destroy_session");
 
+local default_log = require "util.logger".init("xmlhandlers");
+
 local error = error;
 
 module "xmlhandlers"
 
-function init_xmlhandlers(session)
+local ns_prefixes = {
+                                               ["http://www.w3.org/XML/1998/namespace"] = "xml";
+                               }
+
+function init_xmlhandlers(session, stream_callbacks)
                local ns_stack = { "" };
                local curr_ns = "";
                local curr_tag;
                local chardata = {};
                local xml_handlers = {};
-               local log = session.log;
-               local print = function (...) log("info", "xmlhandlers", t_concatall({...}, "\t")); end
+               local log = session.log or default_log;
+               --local print = function (...) log("info", "xmlhandlers", t_concatall({...}, "\t")); end
                
                local send = session.send;
                
+               local cb_streamopened = stream_callbacks.streamopened;
+               local cb_streamclosed = stream_callbacks.streamclosed;
+               
                local stanza
                function xml_handlers:StartElement(name, attr)
                        if stanza and #chardata > 0 then
@@ -34,11 +46,32 @@ function init_xmlhandlers(session)
                                stanza:text(t_concat(chardata));
                                chardata = {};
                        end
-                       curr_ns,name = name:match("^(.+):(%w+)$");
-                       if not stanza then
+                       curr_ns,name = name:match("^(.+)|([%w%-]+)$");
+                       if curr_ns ~= "jabber:server" then
+                               attr.xmlns = curr_ns;
+                       end
+                       
+                       -- FIXME !!!!!
+                       for i, k in ipairs(attr) do
+                               if type(k) == "string" then
+                                       local ns, nm = k:match("^([^|]+)|?([^|]-)$")
+                                       if ns and nm then
+                                               ns = ns_prefixes[ns]; 
+                                               if ns then 
+                                                       attr[ns..":"..nm] = attr[k];
+                                                       attr[i] = ns..":"..nm;
+                                                       attr[k] = nil;
+                                               end
+                                       end
+                               end
+                       end
+                       
+                       if not stanza then --if we are not currently inside a stanza
                                if session.notopen then
                                        if name == "stream" then
-                                               sessionmanager_streamopened(session, attr);
+                                               if cb_streamopened then
+                                                       cb_streamopened(session, attr);
+                                               end
                                                return;
                                        end
                                        error("Client failed to open stream successfully");
@@ -46,11 +79,14 @@ function init_xmlhandlers(session)
                                if curr_ns == "jabber:client" and name ~= "iq" and name ~= "presence" and name ~= "message" then
                                        error("Client sent invalid top-level stanza");
                                end
-                               attr.xmlns = curr_ns;
-                               stanza = st.stanza(name, attr); --{ to = attr.to, type = attr.type, id = attr.id, xmlns = curr_ns });
+                               
+                               stanza = st.stanza(name, attr);
                                curr_tag = stanza;
-                       else
-                               attr.xmlns = curr_ns;
+                       else -- we are inside a stanza, so add a tag
+                               attr.xmlns = nil;
+                               if curr_ns ~= "jabber:server" and curr_ns ~= "jabber:client" then
+                                       attr.xmlns = curr_ns;
+                               end
                                stanza:tag(name, attr);
                        end
                end
@@ -60,14 +96,18 @@ function init_xmlhandlers(session)
                        end
                end
                function xml_handlers:EndElement(name)
-                       curr_ns,name = name:match("^(.+):(%w+)$");
-                       if (not stanza) or #stanza.last_add < 0 or (#stanza.last_add > 0 and name ~= stanza.last_add[#stanza.last_add].name) then 
+                       curr_ns,name = name:match("^(.+)|([%w%-]+)$");
+                       if (not stanza) or (#stanza.last_add > 0 and name ~= stanza.last_add[#stanza.last_add].name) then 
                                if name == "stream" then
                                        log("debug", "Stream closed");
-                                       sm_destroy_session(session);
+                                       if cb_streamclosed then
+                                               cb_streamclosed(session);
+                                       end
                                        return;
+                               elseif name == "error" then
+                                       error("Stream error: "..tostring(name)..": "..tostring(stanza));
                                else
-                                       error("XML parse error in client stream");
+                                       error("XML parse error in client stream with element: "..name);
                                end
                        end
                        if stanza and #chardata > 0 then