X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fxmppserver_listener.lua;h=05e14a0f86d1358d3d52bda9d8e7fada46c5e7f7;hb=d67b44d083d688733b9e4f8fe66e0b4c6995dccb;hp=256c1f725009f9e32abe420f2d7db0b037257382;hpb=f29e5eca194b5aa81452564103ff560fde6d75e8;p=prosody.git

diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index 256c1f72..05e14a0f 100644
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -49,11 +49,14 @@ function stream_callbacks.error(session, error, data)
 end
 
 local function handleerr(err) log("error", "Traceback[s2s]: %s: %s", tostring(err), debug.traceback()); end
-function stream_callbacks.handlestanza(a, b)
-	if b.attr.xmlns == "jabber:client" then --COMPAT: Prosody pre-0.6.2 may send jabber:client
-		b.attr.xmlns = nil;
+function stream_callbacks.handlestanza(session, stanza)
+	if stanza.attr.xmlns == "jabber:client" then --COMPAT: Prosody pre-0.6.2 may send jabber:client
+		stanza.attr.xmlns = nil;
+	end
+	stanza = session.filter("stanzas/in", stanza);
+	if stanza then
+		return xpcall(function () return core_process_stanza(session, stanza) end, handleerr);
 	end
-	xpcall(function () core_process_stanza(a, b) end, handleerr);
 end
 
 local connlisteners_register = require "net.connlisteners".register;
@@ -125,16 +128,23 @@ local function initialize_session(session)
 		session.stream:reset();
 	end
 	
+	local filter = session.filter;
 	function session.data(data)
-		local ok, err = stream:feed(data);
-		if ok then return; end
-		(session.log or log)("warn", "Received invalid XML: %s", data);
-		(session.log or log)("warn", "Problem was: %s", err);
-		session:close("xml-not-well-formed");
+		data = filter("bytes/in", data);
+		if data then
+			local ok, err = stream:feed(data);
+			if ok then return; end
+			(session.log or log)("warn", "Received invalid XML: %s", data);
+			(session.log or log)("warn", "Problem was: %s", err);
+			session:close("xml-not-well-formed");
+		end
 	end
 
 	session.close = session_close;
-	session.dispatch_stanza = stream_callbacks.handlestanza;
+	local handlestanza = stream_callbacks.handlestanza;
+	function session.dispatch_stanza(session, stanza)
+		return handlestanza(session, stanza);
+	end
 end
 
 function xmppserver.onconnect(conn)