diff options
| author | Kim Alvefur <zash@zash.se> | 2016-11-25 05:08:09 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-11-25 05:08:09 +0100 |
| commit | 212ff87e61748fe14571202b1ab85fc7d1e5c2a1 (patch) | |
| tree | 5966a7341ebcf4f6b55c844414c3e58cf9ed9a48 /core/stanza_router.lua | |
| parent | 67dc0fb56ae204ea57288b56bc85fd28cb2ad1d1 (diff) | |
| download | prosody-212ff87e61748fe14571202b1ab85fc7d1e5c2a1.tar.gz prosody-212ff87e61748fe14571202b1ab85fc7d1e5c2a1.zip | |
core.stanza_router: Separate iq type check from child count check
Diffstat (limited to 'core/stanza_router.lua')
| -rw-r--r-- | core/stanza_router.lua | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/stanza_router.lua b/core/stanza_router.lua index 2fb480ee..af797f08 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -67,12 +67,15 @@ function core_process_stanza(origin, stanza) return handle_unhandled_stanza(origin.host, origin, stanza); end if name == "iq" then - if not iq_types[st_type] or ((st_type == "set" or st_type == "get") and (#stanza.tags ~= 1)) then - origin.send(st.error_reply(stanza, "modify", "bad-request", "Invalid IQ type or incorrect number of children")); + if not iq_types[st_type] then + origin.send(st.error_reply(stanza, "modify", "bad-request", "Invalid IQ type")); return; elseif not stanza.attr.id then origin.send(st.error_reply(stanza, "modify", "bad-request", "Missing required 'id' attribute")); return; + elseif (st_type == "set" or st_type == "get") and (#stanza.tags ~= 1) then + origin.send(st.error_reply(stanza, "modify", "bad-request", "Incorrect number of children for IQ stanz")); + return; end end |