X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_roster.lua;h=7ffaa89f2ef6cfa8ac8dd4f969a4a31afc350f24;hb=37bb197d13c606a5de9ede4c7cd32f77f0398eb1;hp=da375e5d5f90445245ea31f43575225cbaf95191;hpb=75721bb86a050dcb12e83f488562dc0fd4ad6a26;p=prosody.git

diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index da375e5d..7ffaa89f 100644
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -11,27 +11,35 @@
 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;
 local rm_add_to_roster = require "core.rostermanager".add_to_roster;
 local rm_roster_push = require "core.rostermanager".roster_push;
-local core_route_stanza = core_route_stanza;
+local core_post_stanza = core_post_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");
+					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
@@ -61,23 +69,22 @@ module:add_iq_handler("c2s", "jabber:iq:roster",
 						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);
+												core_post_stanza(session, st.presence({type="unsubscribed", from=session.full_jid, to=to_bare}));
 											elseif r_item.subscription == "both" or r_item.subscription == "to" then
-												handle_presence(session, st.presence({type="unsubscribe"}), from_bare, to_bare,
-													core_route_stanza, false);
+												core_post_stanza(session, st.presence({type="unsubscribe", from=session.full_jid, to=to_bare}));
 											end
 										else
 											session.send(st.error_reply(stanza, err_type, err_cond, err_msg));
@@ -88,9 +95,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
@@ -102,21 +109,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;