X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_roster.lua;h=bdc9a23318d7d50dd831b95aeddb160968f2c8a5;hb=2f107f1ef33466161ada9f796a1a56e2cce973a4;hp=f2bf1c697cf7b0e433ad72d0fbae243ce98c0b8c;hpb=a4d1701bd5e08cce7b221200394776a3171ddcac;p=prosody.git diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua index f2bf1c69..bdc9a233 100644 --- a/plugins/mod_roster.lua +++ b/plugins/mod_roster.lua @@ -1,4 +1,4 @@ --- Prosody IM v0.3 +-- Prosody IM v0.4 -- Copyright (C) 2008-2009 Matthew Wild -- Copyright (C) 2008-2009 Waqas Hussain -- @@ -11,7 +11,9 @@ local st = require "util.stanza" local jid_split = require "util.jid".split; +local jid_prep = require "util.jid".prep; local t_concat = table.concat; +local tostring = tostring; local handle_presence = require "core.presencemanager".handle_presence; local rm_remove_from_roster = require "core.rostermanager".remove_from_roster; @@ -21,25 +23,40 @@ local core_route_stanza = core_route_stanza; module:add_feature("jabber:iq:roster"); +local rosterver_stream_feature = st.stanza("ver", {xmlns="urn:xmpp:features:rosterver"}):tag("optional"):up(); +module:add_event_hook("stream-features", + function (session, features) + if session.username then + features:add_child(rosterver_stream_feature); + end + end); + module:add_iq_handler("c2s", "jabber:iq:roster", function (session, stanza) if stanza.tags[1].name == "query" then if stanza.attr.type == "get" then - local roster = st.reply(stanza) - :query("jabber:iq:roster"); - for jid in pairs(session.roster) do - if jid ~= "pending" then - roster:tag("item", { - jid = jid, - subscription = session.roster[jid].subscription, - 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(); + local roster = st.reply(stanza); + + local ver = stanza.tags[1].attr.ver + + if (not ver) or tonumber(ver) ~= (session.roster[false].version or 1) then + roster:query("jabber:iq:roster"); + -- Client does not support versioning, or has stale roster + for jid in pairs(session.roster) do + if jid ~= "pending" and jid then + roster:tag("item", { + jid = jid, + subscription = session.roster[jid].subscription, + 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(); + end + roster:up(); -- move out from item end - roster:up(); -- move out from item end + roster.tags[1].attr.ver = tostring(session.roster[false].version or "1"); end session.send(roster); session.interested = true; -- resource is interested in roster updates @@ -47,22 +64,24 @@ module:add_iq_handler("c2s", "jabber:iq:roster", elseif stanza.attr.type == "set" then local query = stanza.tags[1]; 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 + and query.tags[1].attr.xmlns == "jabber:iq:roster" and query.tags[1].attr.jid + -- Protection against overwriting roster.pending, until we move it and query.tags[1].attr.jid ~= "pending" then local item = query.tags[1]; 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 - local node, host, resource = jid_split(item.attr.jid); - local to_bare = node and (node.."@"..host) or host; -- bare JID + local jid = jid_prep(item.attr.jid); + local node, host, resource = jid_split(jid); if not resource and host then - if item.attr.jid ~= from_node.."@"..from_host then + if jid ~= from_node.."@"..from_host then if item.attr.subscription == "remove" then - local r_item = session.roster[item.attr.jid]; + local r_item = session.roster[jid]; if r_item then - local success, err_type, err_cond, err_msg = rm_remove_from_roster(session, item.attr.jid); + local success, err_type, err_cond, err_msg = rm_remove_from_roster(session, jid); if success then session.send(st.reply(stanza)); - rm_roster_push(from_node, from_host, item.attr.jid); + rm_roster_push(from_node, from_host, jid); + local to_bare = node and (node.."@"..host) or host; -- bare JID if r_item.subscription == "both" or r_item.subscription == "from" then handle_presence(session, st.presence({type="unsubscribed"}), from_bare, to_bare, core_route_stanza, false); @@ -79,9 +98,9 @@ module:add_iq_handler("c2s", "jabber:iq:roster", else local r_item = {name = item.attr.name, groups = {}}; if r_item.name == "" then r_item.name = nil; end - if session.roster[item.attr.jid] then - r_item.subscription = session.roster[item.attr.jid].subscription; - r_item.ask = session.roster[item.attr.jid].ask; + if session.roster[jid] then + r_item.subscription = session.roster[jid].subscription; + r_item.ask = session.roster[jid].ask; else r_item.subscription = "none"; end @@ -93,21 +112,27 @@ module:add_iq_handler("c2s", "jabber:iq:roster", end end end - local success, err_type, err_cond, err_msg = rm_add_to_roster(session, item.attr.jid, r_item); + local success, err_type, err_cond, err_msg = rm_add_to_roster(session, jid, r_item); if success then + -- Ok, send success session.send(st.reply(stanza)); - rm_roster_push(from_node, from_host, item.attr.jid); + -- and push change to all resources + rm_roster_push(from_node, from_host, jid); else + -- Adding to roster failed session.send(st.error_reply(stanza, err_type, err_cond, err_msg)); end end else + -- Trying to add self to roster session.send(st.error_reply(stanza, "cancel", "not-allowed")); end else + -- Invalid JID added to roster session.send(st.error_reply(stanza, "modify", "bad-request")); -- FIXME what's the correct error? end else + -- Roster set didn't include a single item, or its name wasn't 'item' session.send(st.error_reply(stanza, "modify", "bad-request")); end return true;