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: Support Application-Specific Conditions in util.error

Browse source
This commit is contained in:
Kim Alvefur 2020-09-26 18:09:10 +02:00
parent 8c0efc9e55
commit 1c53f533b0
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
spec/util_stanza_spec.lua
View file

@ -252,8 +252,20 @@ describe("util.stanza", function()
local gonner = st.error_reply(s, gone);
assert.are.equal("gone", gonner.tags[1].tags[1].name);
assert.are.equal("file:///dev/null", gonner.tags[1].tags[1][1]);
end);
local e = errors.new({ condition = "internal-server-error", text = "Namespaced thing happened",
extra = {namespace="xmpp:example.test", condition="this-happened"} })
local r = st.error_reply(s, e);
assert.are.equal("xmpp:example.test", r.tags[1].tags[3].attr.xmlns);
assert.are.equal("this-happened", r.tags[1].tags[3].name);
local e2 = errors.new({ condition = "internal-server-error", text = "Namespaced thing happened",
extra = {tag=st.stanza("that-happened", { xmlns = "xmpp:example.test", ["another-attribute"] = "here" })} })
local r2 = st.error_reply(s, e2);
assert.are.equal("xmpp:example.test", r2.tags[1].tags[3].attr.xmlns);
assert.are.equal("that-happened", r2.tags[1].tags[3].name);
assert.are.equal("here", r2.tags[1].tags[3].attr["another-attribute"]);
end);
end);
describe("should reject #invalid", function ()

5
util/stanza.lua
View file

@ -473,6 +473,11 @@ local function error_reply(orig, error_type, condition, error_message, error_by)
end
t:up();
if error_message then t:text_tag("text", error_message, xmpp_stanzas_attr); end
if extra and is_stanza(extra.tag) then
t:add_child(extra.tag);
elseif extra and extra.namespace and extra.condition then
t:tag(extra.condition, { xmlns = extra.namespace }):up();
end
return t; -- stanza ready for adding app-specific errors
end