From eb8e9997e03f6b0c399af0a6f88ee85684c74d06 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 24 Oct 2008 03:06:55 +0100
Subject: dialback keys now verified

---
 core/xmlhandlers.lua | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'core/xmlhandlers.lua')

diff --git a/core/xmlhandlers.lua b/core/xmlhandlers.lua
index b1af299f..4187819c 100644
--- a/core/xmlhandlers.lua
+++ b/core/xmlhandlers.lua
@@ -11,6 +11,8 @@ 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"
@@ -21,7 +23,7 @@ function init_xmlhandlers(session, streamopened)
 		local curr_tag;
 		local chardata = {};
 		local xml_handlers = {};
-		local log = session.log;
+		local log = session.log or default_log;
 		local print = function (...) log("info", "xmlhandlers", t_concatall({...}, "\t")); end
 		
 		local send = session.send;
@@ -33,8 +35,11 @@ function init_xmlhandlers(session, streamopened)
 				stanza:text(t_concat(chardata));
 				chardata = {};
 			end
-			curr_ns,name = name:match("^(.+):(%w+)$");
-			if not stanza then
+			log("debug", "Start element: %s", tostring(name));
+			curr_ns,name = name:match("^(.+):([%w%-]+)$");
+			attr.xmlns = curr_ns;
+			
+			if not stanza then --if we are not currently inside a stanza
 				if session.notopen then
 					if name == "stream" then
 						streamopened(session, attr);
@@ -45,10 +50,10 @@ function init_xmlhandlers(session, streamopened)
 				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 });
 				curr_tag = stanza;
-			else
+			else -- we are inside a stanza, so add a tag
 				attr.xmlns = curr_ns;
 				stanza:tag(name, attr);
 			end
@@ -59,12 +64,14 @@ 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");
 					sm_destroy_session(session);
 					return;
+				elseif name == "error" then
+					error("Stream error: "..tostring(name)..": "..tostring(stanza));
 				else
 					error("XML parse error in client stream");
 				end
-- 
cgit v1.2.3