Fixed: stanza_router: Respond with correct stanza error on malformed stanzas
authorWaqas Hussain <waqas20@gmail.com>
Mon, 30 Mar 2009 01:57:51 +0500
changeset 924 db022135aed4
parent 923 c63f9bc45a85
child 925 4861bcf0afa4
Fixed: stanza_router: Respond with correct stanza error on malformed stanzas
core/stanza_router.lua
--- a/core/stanza_router.lua	Mon Mar 30 01:55:56 2009 +0500
+++ b/core/stanza_router.lua	Mon Mar 30 01:57:51 2009 +0500
@@ -51,9 +51,11 @@
 
 	if not stanza.attr.xmlns then stanza.attr.xmlns = "jabber:client"; end -- FIXME Hack. This should be removed when we fix namespace handling.
 	-- TODO verify validity of stanza (as well as JID validity)
-	if stanza.name == "iq" and #stanza.tags > 1 then
-		if stanza.attr.type == "set" or stanza.attr.type == "get" then
-			error("Invalid IQ");
+	if stanza.attr.xmlns == "error" and #stanza.tags == 0 then return; end -- TODO invalid stanza, log
+	if stanza.name == "iq" then
+		if (stanza.attr.type == "set" or stanza.attr.type == "get") and #stanza.tags ~= 1 then
+			origin.send(st.error_reply(stanza, "modify", "bad-request"));
+			return;
 		end
 	end