modulemanager: Add module:set_global() as a cleaner way for a module to declare itsel...

[prosody.git] / core / xmlhandlers.lua

diff --git a/core/xmlhandlers.lua b/core/xmlhandlers.lua
index 61a9e387bf5b2c6e82006f1ba530dcde13051924..d4d9e1416feff0795df40684df531b74f53d9712 100644 (file)
--- a/core/xmlhandlers.lua
+++ b/core/xmlhandlers.lua
@@ -1,3 +1,23 @@
+-- Prosody IM v0.2
+-- Copyright (C) 2008 Matthew Wild
+-- Copyright (C) 2008 Waqas Hussain
+-- 
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; either version 2
+-- of the License, or (at your option) any later version.
+-- 
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+-- 
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+--
+
+
 
 require "util.stanza"
 
@@ -27,26 +47,27 @@ local ns_prefixes = {
 
 function init_xmlhandlers(session, stream_callbacks)
                local ns_stack = { "" };
-               local curr_ns = "";
+               local curr_ns, name = "";
                local curr_tag;
                local chardata = {};
                local xml_handlers = {};
                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 cb_error = stream_callbacks.error or function (session, e) error("XML stream error: "..tostring(e)); end;
+               local cb_handlestanza = stream_callbacks.handlestanza;
+               
+               local stream_tag = stream_callbacks.stream_tag;
                
                local stanza
-               function xml_handlers:StartElement(name, attr)
+               function xml_handlers:StartElement(tagname, attr)
                        if stanza and #chardata > 0 then
                                -- We have some character data in the buffer
                                stanza:text(t_concat(chardata));
                                chardata = {};
                        end
-                       curr_ns,name = name:match("^(.+)|([%w%-]+)$");
+                       local curr_ns,name = tagname:match("^(.+)|([%w%-]+)$");
                        if curr_ns ~= "jabber:server" then
                                attr.xmlns = curr_ns;
                        end
@@ -68,15 +89,18 @@ function init_xmlhandlers(session, stream_callbacks)
                        
                        if not stanza then --if we are not currently inside a stanza
                                if session.notopen then
-                                       print("client opening with "..tostring(name));
-                                       if name == "stream" and cb_streamopened then
-                                               cb_streamopened(session, attr);
-                                               return;
+                                       if tagname == stream_tag then
+                                               if cb_streamopened then
+                                                       cb_streamopened(session, attr);
+                                               end
+                                       else
+                                               -- Garbage before stream?
+                                               cb_error(session, "no-stream");
                                        end
-                                       error("Client failed to open stream successfully");
+                                       return;
                                end
                                if curr_ns == "jabber:client" and name ~= "iq" and name ~= "presence" and name ~= "message" then
-                                       error("Client sent invalid top-level stanza");
+                                       cb_error(session, "invalid-top-level-element");
                                end
                                
                                stanza = st.stanza(name, attr);
@@ -94,17 +118,18 @@ function init_xmlhandlers(session, stream_callbacks)
                                t_insert(chardata, data);
                        end
                end
-               function xml_handlers:EndElement(name)
-                       curr_ns,name = name:match("^(.+)|([%w%-]+)$");
+               function xml_handlers:EndElement(tagname)
+                       curr_ns,name = tagname:match("^(.+)|([%w%-]+)$");
                        if (not stanza) or (#stanza.last_add > 0 and name ~= stanza.last_add[#stanza.last_add].name) then 
-                               if name == "stream" and cb_streamclosed then
-                                       log("debug", "Stream closed");
-                                       cb_streamclosed(session);
+                               if tagname == stream_tag then
+                                       if cb_streamclosed then
+                                               cb_streamclosed(session);
+                                       end
                                        return;
                                elseif name == "error" then
-                                       error("Stream error: "..tostring(name)..": "..tostring(stanza));
+                                       cb_error(session, "stream-error", stanza);
                                else
-                                       error("XML parse error in client stream");
+                                       cb_error(session, "parse-error", "unexpected-element-close", name);
                                end
                        end
                        if stanza and #chardata > 0 then
@@ -114,7 +139,7 @@ function init_xmlhandlers(session, stream_callbacks)
                        end
                        -- Complete stanza
                        if #stanza.last_add == 0 then
-                               session.stanza_dispatch(stanza);
+                               cb_handlestanza(session, stanza);
                                stanza = nil;
                        else
                                stanza:up();