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

util.stanza: Support the 'by' attribute on errors

Browse source 
This is to be used when the entity generating the error is not the same
as the one the stanza was directed to, e.g. an intermediate server.
This commit is contained in:
Kim Alvefur 2019-11-25 20:59:36 +01:00
parent 54da2ab6f7
commit be23b274f6
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
util/stanza.lua
View file

@ -447,7 +447,7 @@ local function reply(orig)
end
local xmpp_stanzas_attr = { xmlns = xmlns_stanzas };
local function error_reply(orig, error_type, condition, error_message)
local function error_reply(orig, error_type, condition, error_message, error_by)
if not is_stanza(orig) then
error("bad argument to error_reply: expected stanza, got "..type(orig));
elseif orig.attr.type == "error" then
@ -455,7 +455,10 @@ local function error_reply(orig, error_type, condition, error_message)
end
local t = reply(orig);
t.attr.type = "error";
t:tag("error", {type = error_type}) --COMPAT: Some day xmlns:stanzas goes here
if t.attr.from == error_by then
error_by = nil;
end
t:tag("error", {type = error_type, by = error_by}) --COMPAT: Some day xmlns:stanzas goes here
:tag(condition, xmpp_stanzas_attr):up();
if error_message then t:text_tag("text", error_message, xmpp_stanzas_attr); end
return t; -- stanza ready for adding app-specific errors