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

mod_roster: pass correct username to roster-item-removed

Browse source 
The other invocations use it that way, and the only listener in trunk
which uses it (in mod_presence) expects it that way.

Passing the username of the JID from the removed entry causes incorrect
unavailable presence stanzas to be sent, allegedly kicking people off
MUCs.

Fixes #1121.
This commit is contained in:
Jonas Schäfer 2021-12-22 13:06:32 +01:00
parent 46a6dafd28
commit 663028421f
2 changed files with 76 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/mod_roster.lua
View file

@ -74,7 +74,7 @@ module:hook("iq/self/jabber:iq:roster:query", function(event)
local r_item = roster[jid];
if r_item then
module:fire_event("roster-item-removed", {
username = node, jid = jid, item = r_item, origin = session, roster = roster,
username = from_node, jid = jid, item = r_item, origin = session, roster = roster,
});
local success, err_type, err_cond, err_msg = rm_remove_from_roster(session, jid);
if success then

75
spec/scansion/issue1121.scs Normal file
View file

@ -0,0 +1,75 @@
# When removing roster contact, Prosody should send directed "unavailable" presence but sends global unavailable presence
[Client] Romeo
jid: romeo@localhost
password: password
[Client] Juliet
jid: juliet@localhost
password: password
-----
Romeo connects
Romeo sends
<presence/>
Romeo receives
<presence from="${Romeo's full JID}"/>
Juliet connects
Juliet sends
<presence/>
Juliet receives
<presence from="${Juliet's full JID}"/>
Romeo sends
<presence to="juliet@localhost" type="subscribe"/>
Romeo receives
<presence from="juliet@localhost" to="romeo@localhost"/>
Juliet receives
<presence from="romeo@localhost" to="juliet@localhost" type="subscribe"/>
Juliet sends
<presence to="romeo@localhost" type="subscribed"/>
Romeo receives
<presence from="${Juliet's full JID}" to="romeo@localhost"/>
Juliet sends
<presence to="romeo@localhost" type="subscribe"/>
Juliet receives
<presence from="romeo@localhost" to="juliet@localhost"/>
Romeo receives
<presence from="juliet@localhost" to="romeo@localhost" type="subscribe"/>
Romeo sends
<presence to="juliet@localhost" type="subscribed"/>
Juliet receives
<presence from="${Romeo's full JID}" to="juliet@localhost"/>
Romeo receives
<presence from="${Juliet's full JID}" to="romeo@localhost"/>
Juliet sends
<iq type="set" id="iq1">
<query xmlns="jabber:iq:roster">
<item jid="romeo@localhost" subscription="remove"/>
</query>
</iq>
Juliet receives
<iq type="result" id="iq1"/>
Romeo receives
<presence from="${Juliet's full JID}" to="romeo@localhost" type="unavailable"/>
Romeo disconnects