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

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index bbf16dd5..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 })
@@ -74,7 +75,8 @@ function handlers.get_subscriptions(origin, stanza, subscriptions)
 		return origin.send(pubsub_error_reply(stanza, ret));
 	end
 	local reply = st.reply(stanza)
-		:tag("subscriptions", { xmlns = xmlns_pubsub });
+		: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
@@ -109,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)
@@ -121,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
@@ -188,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
 
@@ -224,15 +237,30 @@ end
 
 local function build_disco_info(service)
 	local disco_info = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info" })
-		:tag("identity", { category = "pubsub", type = "service" }):up()
+		: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)
@@ -245,7 +273,7 @@ local function handle_disco_items_on_node(event)
 	end
 	
 	local reply = st.reply(stanza)
-		:tag("query", { xmlns = xmlns_disco_items });
+		: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();
@@ -319,6 +347,28 @@ set_service(pubsub.new({
 			
 			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;
+			
+			set_affiliation = false;
+		};
 		owner = {
 			create = true;
 			publish = true;