Shortened log output for incoming stanzas and an added check.

[prosody.git] / core / xmlhandlers.lua

diff --git a/core/xmlhandlers.lua b/core/xmlhandlers.lua
index 4187819cf2105fb99f459cc9fb0d701c1949a8ad..3037a848517051f9d4bcc90252bd70f34ff5c816 100644 (file)
--- a/core/xmlhandlers.lua
+++ b/core/xmlhandlers.lua
@@ -3,6 +3,10 @@ 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;
@@ -17,6 +21,10 @@ local error = error;
 
 module "xmlhandlers"
 
+local ns_prefixes = {
+                                               ["http://www.w3.org/XML/1998/namespace"] = "xml";
+                               }
+
 function init_xmlhandlers(session, streamopened)
                local ns_stack = { "" };
                local curr_ns = "";
@@ -24,7 +32,7 @@ function init_xmlhandlers(session, streamopened)
                local chardata = {};
                local xml_handlers = {};
                local log = session.log or default_log;
-               local print = function (...) log("info", "xmlhandlers", t_concatall({...}, "\t")); end
+               --local print = function (...) log("info", "xmlhandlers", t_concatall({...}, "\t")); end
                
                local send = session.send;
                
@@ -35,9 +43,25 @@ function init_xmlhandlers(session, streamopened)
                                stanza:text(t_concat(chardata));
                                chardata = {};
                        end
-                       log("debug", "Start element: %s", tostring(name));
-                       curr_ns,name = name:match("^(.+):([%w%-]+)$");
-                       attr.xmlns = curr_ns;
+                       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
@@ -54,7 +78,10 @@ function init_xmlhandlers(session, streamopened)
                                stanza = st.stanza(name, attr); --{ to = attr.to, type = attr.type, id = attr.id, xmlns = curr_ns });
                                curr_tag = stanza;
                        else -- we are inside a stanza, so add a tag
-                               attr.xmlns = curr_ns;
+                               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
@@ -64,7 +91,7 @@ function init_xmlhandlers(session, streamopened)
                        end
                end
                function xml_handlers:EndElement(name)
-                       curr_ns,name = name:match("^(.+):([%w%-]+)$");
+                       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 
                                if name == "stream" then
                                        log("debug", "Stream closed");