mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.stanza: Check that argument to error_reply is NOT a stanza of type error

Browse source 
Replying to an error is Very Bad
This commit is contained in:
Kim Alvefur 2019-11-25 20:52:03 +01:00
parent 52b7181979
commit 54da2ab6f7
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
spec/util_stanza_spec.lua
View file

@ -220,6 +220,16 @@ describe("util.stanza", function()
st.error_reply(not "a stanza", "modify", "bad-request");
end, "expected stanza");
end);
it("should reject stanzas of type error", function ()
assert.has.error_match(function ()
st.error_reply(st.message({type="error"}), "cancel", "conflict");
end, "got stanza of type error");
assert.has.error_match(function ()
st.error_reply(st.error_reply(st.message({type="chat"}), "modify", "forbidden"), "cancel", "service-unavailable");
end, "got stanza of type error");
end);
end);
describe("should reject #invalid", function ()

2
util/stanza.lua
View file

@ -450,6 +450,8 @@ local xmpp_stanzas_attr = { xmlns = xmlns_stanzas };
local function error_reply(orig, error_type, condition, error_message)
if not is_stanza(orig) then
error("bad argument to error_reply: expected stanza, got "..type(orig));
elseif orig.attr.type == "error" then
error("bad argument to error_reply: got stanza of type error which must not be replied to");
end
local t = reply(orig);
t.attr.type = "error";