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

rostermanager, mod_presence: Store stanza for incoming subscription requests (fixes #689) (thanks Zash, Ge0rG)

Browse source
This commit is contained in:
Matthew Wild 2018-12-01 22:13:24 +00:00
parent c295aedbfe
commit 3836d03c37
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/rostermanager.lua
View file

@ -263,15 +263,15 @@ end
function is_contact_pending_in(username, host, jid)
local roster = load_roster(username, host);
return roster[false].pending[jid];
return roster[false].pending[jid] ~= nil;
end
local function set_contact_pending_in(username, host, jid)
local function set_contact_pending_in(username, host, jid, stanza)
local roster = load_roster(username, host);
local item = roster[jid];
if item and (item.subscription == "from" or item.subscription == "both") then
return; -- false
end
roster[false].pending[jid] = true;
roster[false].pending[jid] = st.is_stanza(stanza) and st.preserialize(stanza) or true;
return save_roster(username, host, roster, jid);
end
function is_contact_pending_out(username, host, jid)

8
plugins/mod_presence.lua
View file

@ -80,8 +80,10 @@ function handle_normal_presence(origin, stanza)
res.presence.attr.to = nil;
end
end
for jid in pairs(roster[false].pending) do -- resend incoming subscription requests
origin.send(st.presence({type="subscribe", from=jid})); -- TODO add to attribute? Use original?
for jid, pending_request in pairs(roster[false].pending) do -- resend incoming subscription requests
local subscribe = st.clone(st.deserialize(pending_request));
subscribe.attr.type, subscribe.attr.from = "subscribe", jid;
origin.send(subscribe);
end
local request = st.presence({type="subscribe", from=origin.username.."@"..origin.host});
for jid, item in pairs(roster) do -- resend outgoing subscription requests
@ -225,7 +227,7 @@ function handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_b
else
core_post_stanza(hosts[host], st.presence({from=to_bare, to=from_bare, type="unavailable"}), true); -- acknowledging receipt
if not rostermanager.is_contact_pending_in(node, host, from_bare) then
if rostermanager.set_contact_pending_in(node, host, from_bare) then
if rostermanager.set_contact_pending_in(node, host, from_bare, stanza) then
sessionmanager.send_to_available_resources(node, host, stanza);
end -- TODO else return error, unable to save
end