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

MUC: Remove <{muc}x> tags in some errors

Browse source 
Including the payload of the stanza that caused the error is optional
and we're generally not doing it anywhere else.
This commit is contained in:
Kim Alvefur 2021-12-08 21:55:25 +01:00
parent 1c0c380203
commit 449311b2d1
6 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/muc/members_only.lib.lua
View file

@ -122,7 +122,7 @@ module:hook("muc-occupant-pre-join", function(event)
local affiliation = room:get_affiliation(stanza.attr.from); local affiliation = room:get_affiliation(stanza.attr.from);
if valid_affiliations[affiliation or "none"] <= valid_affiliations.none then if valid_affiliations[affiliation or "none"] <= valid_affiliations.none then
local reply = st.error_reply(stanza, "auth", "registration-required", nil, room.jid):up(); local reply = st.error_reply(stanza, "auth", "registration-required", nil, room.jid):up();
event.origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"})); event.origin.send(reply);
return true; return true;
end end
end end

4
plugins/muc/muc.lib.lua
View file

@ -449,7 +449,7 @@ module:hook("muc-occupant-pre-join", function(event)
local affiliation = room:get_affiliation(stanza.attr.from); local affiliation = room:get_affiliation(stanza.attr.from);
if affiliation == "outcast" then if affiliation == "outcast" then
local reply = st.error_reply(stanza, "auth", "forbidden", nil, room.jid):up(); local reply = st.error_reply(stanza, "auth", "forbidden", nil, room.jid):up();
event.origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"})); event.origin.send(reply);
return true; return true;
end end
end, -10); end, -10);
@ -691,7 +691,7 @@ function room_mt:handle_normal_presence(origin, stanza)
-- new nick or has different bare real jid -- new nick or has different bare real jid
log("debug", "%s couldn't join due to nick conflict: %s", real_jid, dest_occupant.nick); log("debug", "%s couldn't join due to nick conflict: %s", real_jid, dest_occupant.nick);
local reply = st.error_reply(stanza, "cancel", "conflict", nil, self.jid):up(); local reply = st.error_reply(stanza, "cancel", "conflict", nil, self.jid):up();
origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"})); origin.send(reply);
return true; return true;
end end

2
plugins/muc/password.lib.lua
View file

@ -51,7 +51,7 @@ module:hook("muc-occupant-pre-join", function(event)
local from, to = stanza.attr.from, stanza.attr.to; local from, to = stanza.attr.from, stanza.attr.to;
module:log("debug", "%s couldn't join due to invalid password: %s", from, to); module:log("debug", "%s couldn't join due to invalid password: %s", from, to);
local reply = st.error_reply(stanza, "auth", "not-authorized", nil, room.jid):up(); local reply = st.error_reply(stanza, "auth", "not-authorized", nil, room.jid):up();
event.origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"})); event.origin.send(reply);
return true; return true;
end end
end, -20); end, -20);

4
plugins/muc/register.lib.lua
View file

@ -85,7 +85,7 @@ local function enforce_nick_policy(event)
if reserved_by and reserved_by ~= jid_bare(stanza.attr.from) then if reserved_by and reserved_by ~= jid_bare(stanza.attr.from) then
module:log("debug", "%s attempted to use nick %s reserved by %s", stanza.attr.from, requested_nick, reserved_by); module:log("debug", "%s attempted to use nick %s reserved by %s", stanza.attr.from, requested_nick, reserved_by);
local reply = st.error_reply(stanza, "cancel", "conflict", nil, room.jid):up(); local reply = st.error_reply(stanza, "cancel", "conflict", nil, room.jid):up();
origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"})); origin.send(reply);
return true; return true;
end end
@ -98,7 +98,7 @@ local function enforce_nick_policy(event)
elseif event.dest_occupant.nick ~= jid_bare(event.dest_occupant.nick) .. "/" .. nick then elseif event.dest_occupant.nick ~= jid_bare(event.dest_occupant.nick) .. "/" .. nick then
module:log("debug", "Attempt by %s to join as %s, but their reserved nick is %s", stanza.attr.from, requested_nick, nick); module:log("debug", "Attempt by %s to join as %s, but their reserved nick is %s", stanza.attr.from, requested_nick, nick);
local reply = st.error_reply(stanza, "cancel", "not-acceptable", nil, room.jid):up(); local reply = st.error_reply(stanza, "cancel", "not-acceptable", nil, room.jid):up();
origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"})); origin.send(reply);
return true; return true;
end end
end end

2
spec/scansion/muc_register.scs
View file

@ -180,7 +180,6 @@ Rosaline receives:
<error type='cancel' by='room@conference.localhost'> <error type='cancel' by='room@conference.localhost'>
<conflict xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> <conflict xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
</error> </error>
<x xmlns='http://jabber.org/protocol/muc'/>
</presence> </presence>
# In a heated moment, Juliet unregisters from the room # In a heated moment, Juliet unregisters from the room
@ -291,7 +290,6 @@ Rosaline receives:
<error type='cancel' by='room@conference.localhost'> <error type='cancel' by='room@conference.localhost'>
<conflict xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> <conflict xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
</error> </error>
<x xmlns='http://jabber.org/protocol/muc'/>
</presence> </presence>
# Juliet, however, quietly joins the room with success # Juliet, however, quietly joins the room with success

2
spec/scansion/muc_show_offline.scs
View file

@ -185,7 +185,6 @@ Rosaline receives:
<error type='cancel' by='room@conference.localhost'> <error type='cancel' by='room@conference.localhost'>
<conflict xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> <conflict xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
</error> </error>
<x xmlns='http://jabber.org/protocol/muc'/>
</presence> </presence>
# In a heated moment, Juliet unregisters from the room # In a heated moment, Juliet unregisters from the room
@ -296,7 +295,6 @@ Rosaline receives:
<error type='cancel' by='room@conference.localhost'> <error type='cancel' by='room@conference.localhost'>
<conflict xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> <conflict xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
</error> </error>
<x xmlns='http://jabber.org/protocol/muc'/>
</presence> </presence>
# Juliet, however, quietly joins the room with success # Juliet, however, quietly joins the room with success