aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2011-01-29 04:42:56 +0500
committerWaqas Hussain <waqas20@gmail.com>2011-01-29 04:42:56 +0500
commit4e486d4ba9300c553a7a8fce15037141d48a77f5 (patch)
tree2477a7e1065af309795dec9ba27ec97bafd28ce3
parentbd95b3ba7be4490956e242753869d969f08504c6 (diff)
downloadprosody-4e486d4ba9300c553a7a8fce15037141d48a77f5.tar.gz
prosody-4e486d4ba9300c553a7a8fce15037141d48a77f5.zip
stanza_router: Return a <bad-request/> error on invalid IQ type.
-rw-r--r--core/stanza_router.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 97d328a1..406ad2f0 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -40,6 +40,7 @@ local function handle_unhandled_stanza(host, origin, stanza)
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 @@ function core_process_stanza(origin, stanza)
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