X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_pubsub.lua;h=40b119ccb234bca979761a9bcd18ea01cc6e591c;hb=88b01c6a41f9899466f3faff8ef820dd6bbcbd51;hp=efcbd7695b3f9ee878c0e34f488fc61645a575b6;hpb=5fcaaad24974593786a80d593ba496020e293000;p=prosody.git

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index efcbd769..40b119cc 100644
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -3,14 +3,14 @@ local st = require "util.stanza";
 local jid_bare = require "util.jid".bare;
 local uuid_generate = require "util.uuid".generate;
 
-require "core.modulemanager".load(module.host, "iq");
-
 local xmlns_pubsub = "http://jabber.org/protocol/pubsub";
 local xmlns_pubsub_errors = "http://jabber.org/protocol/pubsub#errors";
 local xmlns_pubsub_event = "http://jabber.org/protocol/pubsub#event";
 
 local autocreate_on_publish = module:get_option_boolean("autocreate_on_publish", false);
 local autocreate_on_subscribe = module:get_option_boolean("autocreate_on_subscribe", false);
+local pubsub_disco_name = module:get_option("name");
+if type(pubsub_disco_name) ~= "string" then pubsub_disco_name = "Prosody PubSub Service"; end
 
 local service;
 
@@ -57,6 +57,7 @@ function handlers.get_items(origin, stanza, items)
 	for _, entry in pairs(results) do
 		data:add_child(entry);
 	end
+	local reply;
 	if data then
 		reply = st.reply(stanza)
 			:tag("pubsub", { xmlns = xmlns_pubsub })
@@ -67,6 +68,21 @@ function handlers.get_items(origin, stanza, items)
 	return origin.send(reply);
 end
 
+function handlers.get_subscriptions(origin, stanza, subscriptions)
+	local node = subscriptions.attr.node;
+	local ok, ret = service:get_subscriptions(node, stanza.attr.from, stanza.attr.from);
+	if not ok then
+		return origin.send(pubsub_error_reply(stanza, ret));
+	end
+	local reply = st.reply(stanza)
+		:tag("pubsub", { xmlns = xmlns_pubsub })
+			:tag("subscriptions");
+	for _, sub in ipairs(ret) do
+		reply:tag("subscription", { node = sub.node, jid = sub.jid, subscription = 'subscribed' }):up();
+	end
+	return origin.send(reply);
+end
+
 function handlers.set_create(origin, stanza, create)
 	local node = create.attr.node;
 	local ok, ret, reply;
@@ -95,10 +111,11 @@ end
 
 function handlers.set_subscribe(origin, stanza, subscribe)
 	local node, jid = subscribe.attr.node, subscribe.attr.jid;
-	if jid_bare(jid) ~= jid_bare(stanza.attr.from) then
-		return origin.send(pubsub_error_reply(stanza, "invalid-jid"));
+	local options_tag, options = stanza.tags[1]:get_child("options"), nil;
+	if options_tag then
+		options = options_form:data(options_tag.tags[1]);
 	end
-	local ok, ret = service:add_subscription(node, stanza.attr.from, jid);
+	local ok, ret = service:add_subscription(node, stanza.attr.from, jid, options);
 	local reply;
 	if ok then
 		reply = st.reply(stanza)
@@ -107,18 +124,28 @@ function handlers.set_subscribe(origin, stanza, subscribe)
 					node = node,
 					jid = jid,
 					subscription = "subscribed"
-				});
+				}):up();
+		if options_tag then
+			reply:add_child(options_tag);
+		end
 	else
 		reply = pubsub_error_reply(stanza, ret);
 	end
-	return origin.send(reply);
+	origin.send(reply);
+	if ok then
+		-- Send all current items
+		local ok, items = service:get_items(node, stanza.attr.from);
+		if items then
+			local jids = { [jid] = options or true };
+			for id, item in pairs(items) do
+				service.config.broadcaster(node, jids, item);
+			end
+		end
+	end
 end
 
 function handlers.set_unsubscribe(origin, stanza, unsubscribe)
 	local node, jid = unsubscribe.attr.node, unsubscribe.attr.jid;
-	if jid_bare(jid) ~= jid_bare(stanza.attr.from) then
-		return origin.send(pubsub_error_reply(stanza, "invalid-jid"));
-	end
 	local ok, ret = service:remove_subscription(node, stanza.attr.from, jid);
 	local reply;
 	if ok then
@@ -174,7 +201,7 @@ function simple_broadcast(node, jids, item)
 	for jid in pairs(jids) do
 		module:log("debug", "Sending notification to %s", jid);
 		message.attr.to = jid;
-		core_post_stanza(hosts[module.host], message);
+		module:send(message);
 	end
 end
 
@@ -187,13 +214,17 @@ local feature_map = {
 	retract = { "delete-items", "retract-items" };
 	publish = { "publish" };
 	get_items = { "retrieve-items" };
+	add_subscription = { "subscribe" };
+	get_subscriptions = { "retrieve-subscriptions" };
 };
 
 local function add_disco_features_from_service(disco, service)
 	for method, features in pairs(feature_map) do
 		if service[method] then
-			for _, feature in ipairs(feature_map) do
-				disco:tag("feature", { var = xmlns_pubsub.."#"..feature }):up();
+			for _, feature in ipairs(features) do
+				if feature then
+					disco:tag("feature", { var = xmlns_pubsub.."#"..feature }):up();
+				end
 			end
 		end
 	end
@@ -205,18 +236,57 @@ local function add_disco_features_from_service(disco, service)
 end
 
 local function build_disco_info(service)
-	disco_info = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info" })
-		:tag("identity", { category = "pubsub", type = "service" }):up()
+	local disco_info = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info" })
+		:tag("identity", { category = "pubsub", type = "service", name = pubsub_disco_name }):up()
 		:tag("feature", { var = "http://jabber.org/protocol/pubsub" }):up();
 	add_disco_features_from_service(disco_info, service);
+	return disco_info;
 end
 
 module:hook("iq-get/host/http://jabber.org/protocol/disco#info:query", function (event)
-	event.origin.send(st.reply(event.stanza):add_child(disco_info));
-	return true;
+	local origin, stanza = event.origin, event.stanza;
+	local node = stanza.tags[1].attr.node;
+	if not node then
+		return origin.send(st.reply(stanza):add_child(disco_info));
+	else
+		local ok, ret = service:get_nodes(stanza.attr.from);
+		if ok and not ret[node] then
+			ok, ret = false, "item-not-found";
+		end
+		if not ok then
+			return origin.send(pubsub_error_reply(stanza, ret));
+		end
+		local reply = st.reply(stanza)
+			:tag("query", { xmlns = "http://jabber.org/protocol/disco#info", node = node })
+				:tag("identity", { category = "pubsub", type = "leaf" });
+		return origin.send(reply);
+	end
 end);
 
+local function handle_disco_items_on_node(event)
+	local stanza, origin = event.stanza, event.origin;
+	local query = stanza.tags[1];
+	local node = query.attr.node;
+	local ok, ret = service:get_items(node, stanza.attr.from);
+	if not ok then
+		return origin.send(pubsub_error_reply(stanza, ret));
+	end
+	
+	local reply = st.reply(stanza)
+		:tag("query", { xmlns = "http://jabber.org/protocol/disco#items", node = node });
+	
+	for id, item in pairs(ret) do
+		reply:tag("item", { jid = module.host, name = id }):up();
+	end
+	
+	return origin.send(reply);
+end
+
+
 module:hook("iq-get/host/http://jabber.org/protocol/disco#items:query", function (event)
+	if event.stanza.tags[1].attr.node then
+		return handle_disco_items_on_node(event);
+	end
 	local ok, ret = service:get_nodes(event.stanza.attr.from);
 	if not ok then
 		event.origin.send(pubsub_error_reply(stanza, ret));
@@ -233,7 +303,8 @@ end);
 
 local admin_aff = module:get_option_string("default_admin_affiliation", "owner");
 local function get_affiliation(jid)
-	if jid == module.host or usermanager.is_admin(jid, module.host) then
+	local bare_jid = jid_bare(jid);
+	if bare_jid == module.host or usermanager.is_admin(bare_jid, module.host) then
 		return admin_aff;
 	end
 end
@@ -263,11 +334,35 @@ set_service(pubsub.new({
 			subscribe = true;
 			unsubscribe = true;
 			get_subscription = true;
+			get_subscriptions = true;
+			get_items = true;
+			
+			subscribe_other = false;
+			unsubscribe_other = false;
+			get_subscription_other = false;
+			get_subscriptions_other = false;
+			
+			be_subscribed = true;
+			be_unsubscribed = true;
+			
+			set_affiliation = false;
+		};
+		publisher = {
+			create = false;
+			publish = true;
+			retract = true;
+			get_nodes = true;
+			
+			subscribe = true;
+			unsubscribe = true;
+			get_subscription = true;
+			get_subscriptions = true;
 			get_items = true;
 			
 			subscribe_other = false;
 			unsubscribe_other = false;
 			get_subscription_other = false;
+			get_subscriptions_other = false;
 			
 			be_subscribed = true;
 			be_unsubscribed = true;
@@ -283,12 +378,14 @@ set_service(pubsub.new({
 			subscribe = true;
 			unsubscribe = true;
 			get_subscription = true;
+			get_subscriptions = true;
 			get_items = true;
 			
 			
 			subscribe_other = true;
 			unsubscribe_other = true;
 			get_subscription_other = true;
+			get_subscriptions_other = true;
 			
 			be_subscribed = true;
 			be_unsubscribed = true;
@@ -302,7 +399,6 @@ set_service(pubsub.new({
 	
 	broadcaster = simple_broadcast;
 	get_affiliation = get_affiliation;
-	jids_equal = function (jid1, jid2)
-		return jid_bare(jid1) == jid_bare(jid2);
-	end;
+	
+	normalize_jid = jid_bare;
 }));