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

Bug fixes and checks for presence subscriptions, etc

Browse source
This commit is contained in:
Waqas Hussain 2008-10-26 00:22:18 +05:00
parent 091e961c40
commit 1746f7eea0
4 changed files with 64 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/rostermanager.lua
View file

@ -49,7 +49,7 @@ function remove_from_roster(session, jid)
end end
function roster_push(username, host, jid) function roster_push(username, host, jid)
if hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster then if jid ~= "pending" and hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster then
local item = hosts[host].sessions[username].roster[jid]; local item = hosts[host].sessions[username].roster[jid];
local stanza = st.iq({type="set"}); local stanza = st.iq({type="set"});
stanza:tag("query", {xmlns = "jabber:iq:roster"}); stanza:tag("query", {xmlns = "jabber:iq:roster"});
@ -74,19 +74,23 @@ function roster_push(username, host, jid)
end end
function load_roster(username, host) function load_roster(username, host)
log("debug", "load_roster: asked for: "..username.."@"..host);
if hosts[host] and hosts[host].sessions[username] then if hosts[host] and hosts[host].sessions[username] then
local roster = hosts[host].sessions[username].roster; local roster = hosts[host].sessions[username].roster;
if not roster then if not roster then
log("debug", "load_roster: loading for new user: "..username.."@"..host);
roster = datamanager.load(username, host, "roster") or {}; roster = datamanager.load(username, host, "roster") or {};
hosts[host].sessions[username].roster = roster; hosts[host].sessions[username].roster = roster;
end end
return roster; return roster;
end end
-- Attempt to load roster for non-loaded user -- Attempt to load roster for non-loaded user
log("debug", "load_roster: loading for offline user: "..username.."@"..host);
return datamanager.load(username, host, "roster") or {}; return datamanager.load(username, host, "roster") or {};
end end
function save_roster(username, host) function save_roster(username, host)
log("debug", "save_roster: saving roster for "..username.."@"..host);
if hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster then if hosts[host] and hosts[host].sessions[username] and hosts[host].sessions[username].roster then
return datamanager.store(username, host, "roster", hosts[host].sessions[username].roster); return datamanager.store(username, host, "roster", hosts[host].sessions[username].roster);
end end
@ -159,7 +163,7 @@ end
function is_contact_pending_in(username, host, jid) function is_contact_pending_in(username, host, jid)
local roster = load_roster(username, host); local roster = load_roster(username, host);
return roster.pending or roster.pending[jid]; return roster.pending and roster.pending[jid];
end end
function set_contact_pending_in(username, host, jid, pending) function set_contact_pending_in(username, host, jid, pending)
local roster = load_roster(username, host); local roster = load_roster(username, host);
@ -183,10 +187,11 @@ function set_contact_pending_out(username, host, jid) -- subscribe
return true; return true;
end end
if not item then if not item then
item = {subscription = "none"}; item = {subscription = "none", groups = {}};
roster[jid] = item; roster[jid] = item;
end end
item.ask = "subscribe"; item.ask = "subscribe";
log("debug", "set_contact_pending_out: saving roster; set "..username.."@"..host..".roster["..jid.."].ask=subscribe");
return datamanager.store(username, host, "roster", roster); return datamanager.store(username, host, "roster", roster);
end end
function unsubscribe(username, host, jid) function unsubscribe(username, host, jid)
@ -211,7 +216,7 @@ function subscribed(username, host, jid)
if item.subscription == "none" then if item.subscription == "none" then
item.subscription = "from"; item.subscription = "from";
else -- subscription == to else -- subscription == to
item.subsctiption = "both"; item.subscription = "both";
end end
roster.pending[jid] = nil; roster.pending[jid] = nil;
-- TODO maybe remove roster.pending if empty -- TODO maybe remove roster.pending if empty

61
core/stanza_router.lua
View file

@ -60,6 +60,12 @@ function core_process_stanza(origin, stanza)
if not to then if not to then
core_handle_stanza(origin, stanza); core_handle_stanza(origin, stanza);
elseif origin.type == "c2s" and stanza.name == "presence" and stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
local node, host = jid_split(stanza.attr.to);
local to_bare = node and (node.."@"..host) or host; -- bare JID
local from_node, from_host = jid_split(stanza.attr.from);
local from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID
handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare);
elseif hosts[to] and hosts[to].type == "local" then elseif hosts[to] and hosts[to].type == "local" then
core_handle_stanza(origin, stanza); core_handle_stanza(origin, stanza);
elseif stanza.name == "iq" and not select(3, jid_split(to)) then elseif stanza.name == "iq" and not select(3, jid_split(to)) then
@ -196,75 +202,88 @@ function send_presence_of_available_resources(user, host, jid, recipient_session
return count; return count;
end end
function handle_outbound_presence_subscriptions(origin, stanza, from_bare, to_bare) function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare)
local node, host = jid_split(to_bare); local node, host = jid_split(from_bare);
local st_from, st_to = stanza.attr.from, stanza.attr.to;
stanza.attr.from, stanza.attr.to = from_bare, to_bare;
if stanza.attr.type == "subscribe" then if stanza.attr.type == "subscribe" then
log("debug", "outbound subscribe from "..from_bare.." for "..to_bare);
-- 1. route stanza -- 1. route stanza
-- 2. roster push (subscription = none, ask = subscribe) -- 2. roster push (subscription = none, ask = subscribe)
if rostermanager.set_contact_pending_out(node, host, from_bare) then if rostermanager.set_contact_pending_out(node, host, to_bare) then
rostermanager.roster_push(node, host, from_bare); rostermanager.roster_push(node, host, to_bare);
end -- else file error end -- else file error
core_route_stanza(origin, st.presence({from=from_bare, to=to_bare, type="subscribe"})); core_route_stanza(origin, stanza);
elseif stanza.attr.type == "unsubscribe" then elseif stanza.attr.type == "unsubscribe" then
log("debug", "outbound unsubscribe from "..from_bare.." for "..to_bare);
-- 1. route stanza -- 1. route stanza
-- 2. roster push (subscription = none or from) -- 2. roster push (subscription = none or from)
if rostermanager.unsubscribe(node, host, from_bare) then if rostermanager.unsubscribe(node, host, to_bare) then
rostermanager.roster_push(node, host, from_bare); -- FIXME do roster push when roster has in fact not changed? rostermanager.roster_push(node, host, to_bare); -- FIXME do roster push when roster has in fact not changed?
end -- else file error end -- else file error
core_route_stanza(origin, st.presence({from=from_bare, to=to_bare, type="unsubscribe"})); core_route_stanza(origin, stanza);
elseif stanza.attr.type == "subscribed" then elseif stanza.attr.type == "subscribed" then
log("debug", "outbound subscribed from "..from_bare.." for "..to_bare);
-- 1. route stanza -- 1. route stanza
-- 2. roster_push () -- 2. roster_push ()
-- 3. send_presence_of_available_resources -- 3. send_presence_of_available_resources
if rostermanager.subscribed(node, host, from_bare) then if rostermanager.subscribed(node, host, to_bare) then
rostermanager.roster_push(node, host, from_bare); rostermanager.roster_push(node, host, to_bare);
core_route_stanza(origin, st.presence({from=from_bare, to=to_bare, type="subscribed"})); core_route_stanza(origin, stanza);
send_presence_of_available_resources(user, host, from_bare, origin); send_presence_of_available_resources(node, host, to_bare, origin);
end end
elseif stanza.attr.type == "unsubscribed" then elseif stanza.attr.type == "unsubscribed" then
log("debug", "outbound unsubscribed from "..from_bare.." for "..to_bare);
-- 1. route stanza -- 1. route stanza
-- 2. roster push (subscription = none or to) -- 2. roster push (subscription = none or to)
if rostermanager.unsubscribed(node, host, from_bare) then if rostermanager.unsubscribed(node, host, to_bare) then
rostermanager.roster_push(node, host, from_bare); rostermanager.roster_push(node, host, to_bare);
core_route_stanza(origin, st.presence({from=from_bare, to=to_bare, type="unsubscribed"})); core_route_stanza(origin, stanza);
end end
end end
stanza.attr.from, stanza.attr.to = st_from, st_to;
end end
function handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare) function handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare)
local node, host = jid_split(to_bare); local node, host = jid_split(to_bare);
local st_from, st_to = stanza.attr.from, stanza.attr.to;
stanza.attr.from, stanza.attr.to = from_bare, to_bare;
if stanza.attr.type == "probe" then if stanza.attr.type == "probe" then
if rostermanager.is_contact_subscribed(node, host, from_bare) then if rostermanager.is_contact_subscribed(node, host, from_bare) then
if 0 == send_presence_of_available_resources(node, host, from_bare, origin) then if 0 == send_presence_of_available_resources(node, host, from_bare, origin) then
-- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too) -- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too)
end end
else else
send(origin, st.presence({from=to_bare, to=from_bare, type="unsubscribed"})); core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="unsubscribed"}));
end end
elseif stanza.attr.type == "subscribe" then elseif stanza.attr.type == "subscribe" then
log("debug", "inbound subscribe from "..from_bare.." for "..to_bare);
if rostermanager.is_contact_subscribed(node, host, from_bare) then if rostermanager.is_contact_subscribed(node, host, from_bare) then
send(origin, st.presence({from=to_bare, to=from_bare, type="subscribed"})); -- already subscribed core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="subscribed"})); -- already subscribed
else else
if not rostermanager.is_contact_pending(node, host, from_bare) then if not rostermanager.is_contact_pending_in(node, host, from_bare) then
if rostermanager.set_contact_pending(node, host, from_bare) then if rostermanager.set_contact_pending_in(node, host, from_bare) then
sessionmanager.send_to_available_resources(node, host, st.presence({from=from_bare, type="subscribe"})); sessionmanager.send_to_available_resources(node, host, stanza);
end -- TODO else return error, unable to save end -- TODO else return error, unable to save
end end
end end
elseif stanza.attr.type == "unsubscribe" then elseif stanza.attr.type == "unsubscribe" then
log("debug", "inbound unsubscribe from "..from_bare.." for "..to_bare);
if rostermanager.process_inbound_unsubscribe(node, host, from_bare) then if rostermanager.process_inbound_unsubscribe(node, host, from_bare) then
rostermanager.roster_push(node, host, from_bare); rostermanager.roster_push(node, host, from_bare);
end end
elseif stanza.attr.type == "subscribed" then elseif stanza.attr.type == "subscribed" then
log("debug", "inbound subscribed from "..from_bare.." for "..to_bare);
if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then
rostermanager.roster_push(node, host, from_bare); rostermanager.roster_push(node, host, from_bare);
send_presence_of_available_resources(node, host, from_bare, origin);
end end
elseif stanza.attr.type == "unsubscribed" then elseif stanza.attr.type == "unsubscribed" then
log("debug", "inbound unsubscribed from "..from_bare.." for "..to_bare);
if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then
rostermanager.roster_push(node, host, from_bare); rostermanager.roster_push(node, host, from_bare);
end end
end -- discard any other type end -- discard any other type
stanza.attr.from, stanza.attr.to = st_from, st_to;
end end
function core_route_stanza(origin, stanza) function core_route_stanza(origin, stanza)

21
plugins/mod_roster.lua
View file

@ -16,14 +16,16 @@ add_iq_handler("c2s", "jabber:iq:roster",
local roster = st.reply(stanza) local roster = st.reply(stanza)
:query("jabber:iq:roster"); :query("jabber:iq:roster");
for jid in pairs(session.roster) do for jid in pairs(session.roster) do
roster:tag("item", { if jid ~= "pending" then
jid = jid, roster:tag("item", {
subscription = session.roster[jid].subscription, jid = jid,
ask = session.roster[jid].ask, subscription = session.roster[jid].subscription,
name = session.roster[jid].name, ask = session.roster[jid].ask,
}); name = session.roster[jid].name,
for group in pairs(session.roster[jid].groups) do });
roster:tag("group"):text(group):up(); for group in pairs(session.roster[jid].groups) do
roster:tag("group"):text(group):up();
end
end end
end end
send(session, roster); send(session, roster);
@ -32,7 +34,8 @@ add_iq_handler("c2s", "jabber:iq:roster",
elseif stanza.attr.type == "set" then elseif stanza.attr.type == "set" then
local query = stanza.tags[1]; local query = stanza.tags[1];
if #query.tags == 1 and query.tags[1].name == "item" if #query.tags == 1 and query.tags[1].name == "item"
and query.tags[1].attr.xmlns == "jabber:iq:roster" and query.tags[1].attr.jid then and query.tags[1].attr.xmlns == "jabber:iq:roster" and query.tags[1].attr.jid
and query.tags[1].attr.jid ~= "pending" then
local item = query.tags[1]; local item = query.tags[1];
local from_node, from_host = jid_split(stanza.attr.from); local from_node, from_host = jid_split(stanza.attr.from);
local node, host, resource = jid_split(item.attr.jid); local node, host, resource = jid_split(item.attr.jid);

3
util/datamanager.lua
View file

@ -6,6 +6,7 @@ local loadfile, setfenv, pcall = loadfile, setfenv, pcall;
local log = log; local log = log;
local io_open = io.open; local io_open = io.open;
local tostring = tostring; local tostring = tostring;
local error = error;
module "datamanager" module "datamanager"
@ -49,6 +50,8 @@ local function simplesave (f, o)
f:write(",\n") f:write(",\n")
end end
f:write("}\n") f:write("}\n")
elseif type(o) == "boolean" then
f:write(o and "true" or "false");
else else
error("cannot serialize a " .. type(o)) error("cannot serialize a " .. type(o))
end end