stanza_router: Return a <bad-request/> error on invalid IQ type.
authorWaqas Hussain <waqas20@gmail.com>
Sat, 29 Jan 2011 04:42:56 +0500
changeset 4130 c3508071af47
parent 4129 c86b68abe12e
child 4131 81636fa77cab
child 4132 ccc16434dbe2
stanza_router: Return a <bad-request/> error on invalid IQ type.
core/stanza_router.lua
--- a/core/stanza_router.lua	Sat Jan 29 04:42:05 2011 +0500
+++ b/core/stanza_router.lua	Sat Jan 29 04:42:56 2011 +0500
@@ -40,6 +40,7 @@
 	end
 end
 
+local iq_types = { set=true, get=true, result=true, error=true };
 function core_process_stanza(origin, stanza)
 	(origin.log or log)("debug", "Received[%s]: %s", origin.type, stanza:top_tag())
 
@@ -47,8 +48,8 @@
 	if stanza.attr.type == "error" and #stanza.tags == 0 then return; end -- TODO invalid stanza, log
 	if stanza.name == "iq" then
 		if not stanza.attr.id then stanza.attr.id = ""; end -- COMPAT Jabiru doesn't send the id attribute on roster requests
-		if (stanza.attr.type == "set" or stanza.attr.type == "get") and (#stanza.tags ~= 1) then
-			origin.send(st.error_reply(stanza, "modify", "bad-request"));
+		if not iq_types[stanza.attr.type] or ((stanza.attr.type == "set" or stanza.attr.type == "get") and (#stanza.tags ~= 1)) then
+			origin.send(st.error_reply(stanza, "modify", "bad-request", "Invalid IQ type or incorrect number of children"));
 			return;
 		end
 	end