projects / prosody.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge s2s branch
[prosody.git] / plugins / mod_pubsub.lua
diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index 48bfb8841f327e9c6380b812f870d8e1d555a919..22969ab5f067d9fee54364c8ffc933d9fcf6bb99 100644 (file)
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -2,15 +2,17 @@ local pubsub = require "util.pubsub";
 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 usermanager = require "core.usermanager";
 
 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 xmlns_pubsub_owner = "http://jabber.org/protocol/pubsub#owner";
 
 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;
 
@@ -20,6 +22,9 @@ function handle_pubsub_iq(event)
        local origin, stanza = event.origin, event.stanza;
        local pubsub = stanza.tags[1];
        local action = pubsub.tags[1];
+       if not action then
+               return origin.send(st.error_reply(stanza, "cancel", "bad-request"));
+       end
        local handler = handlers[stanza.attr.type.."_"..action.name];
        if handler then
                handler(origin, stanza, action);
@@ -30,6 +35,8 @@ end
 local pubsub_errors = {
        ["conflict"] = { "cancel", "conflict" };
        ["invalid-jid"] = { "modify", "bad-request", nil, "invalid-jid" };
+       ["jid-required"] = { "modify", "bad-request", nil, "jid-required" };
+       ["nodeid-required"] = { "modify", "bad-request", nil, "nodeid-required" };
        ["item-not-found"] = { "cancel", "item-not-found" };
        ["not-subscribed"] = { "modify", "unexpected-request", nil, "not-subscribed" };
        ["forbidden"] = { "cancel", "forbidden" };
@@ -48,6 +55,9 @@ function handlers.get_items(origin, stanza, items)
        local item = items:get_child("item");
        local id = item and item.attr.id;
        
+       if not node then
+               return origin.send(pubsub_error_reply(stanza, "nodeid-required"));
+       end
        local ok, results = service:get_items(node, stanza.attr.from, id);
        if not ok then
                return origin.send(pubsub_error_reply(stanza, results));
@@ -57,6 +67,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 })
@@ -69,12 +80,16 @@ end
 
 function handlers.get_subscriptions(origin, stanza, subscriptions)
        local node = subscriptions.attr.node;
+       if not node then
+               return origin.send(pubsub_error_reply(stanza, "nodeid-required"));
+       end
        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("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
@@ -107,12 +122,35 @@ function handlers.set_create(origin, stanza, create)
        return origin.send(reply);
 end
 
+function handlers.set_delete(origin, stanza, delete)
+       local node = delete.attr.node;
+
+       local reply, notifier;
+       if not node then
+               return origin.send(pubsub_error_reply(stanza, "nodeid-required"));
+       end
+       local ok, ret = service:delete(node, stanza.attr.from);
+       if ok then
+               reply = st.reply(stanza);
+       else
+               reply = pubsub_error_reply(stanza, ret);
+       end
+       return origin.send(reply);
+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"));
+       if not (node and jid) then
+               return origin.send(pubsub_error_reply(stanza, jid and "nodeid-required" or "invalid-jid"));
+       end
+       --[[
+       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 options_tag, options; -- FIXME
+       local ok, ret = service:add_subscription(node, stanza.attr.from, jid, options);
        local reply;
        if ok then
                reply = st.reply(stanza)
@@ -121,17 +159,20 @@ 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);
 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"));
+       if not (node and jid) then
+               return origin.send(pubsub_error_reply(stanza, jid and "nodeid-required" or "invalid-jid"));
        end
        local ok, ret = service:remove_subscription(node, stanza.attr.from, jid);
        local reply;
@@ -145,8 +186,17 @@ end
 
 function handlers.set_publish(origin, stanza, publish)
        local node = publish.attr.node;
+       if not node then
+               return origin.send(pubsub_error_reply(stanza, "nodeid-required"));
+       end
        local item = publish:get_child("item");
-       local id = (item and item.attr.id) or uuid_generate();
+       local id = (item and item.attr.id);
+       if not id then
+               id = uuid_generate();
+               if item then
+                       item.attr.id = id;
+               end
+       end
        local ok, ret = service:publish(node, stanza.attr.from, id, item);
        local reply;
        if ok then
@@ -165,6 +215,9 @@ function handlers.set_retract(origin, stanza, retract)
        notify = (notify == "1") or (notify == "true");
        local item = retract:get_child("item");
        local id = item and item.attr.id
+       if not (node and id) then
+               return origin.send(pubsub_error_reply(stanza, node and "item-not-found" or "nodeid-required"));
+       end
        local reply, notifier;
        if notify then
                notifier = st.stanza("retract", { id = id });
@@ -178,28 +231,49 @@ function handlers.set_retract(origin, stanza, retract)
        return origin.send(reply);
 end
 
-function simple_broadcast(node, jids, item)
-       item = st.clone(item);
-       item.attr.xmlns = nil; -- Clear the pubsub namespace
+function handlers.set_purge(origin, stanza, purge)
+       local node, notify = purge.attr.node, purge.attr.notify;
+       notify = (notify == "1") or (notify == "true");
+       local reply;
+       if not node then
+               return origin.send(pubsub_error_reply(stanza, "nodeid-required"));
+       end
+       local ok, ret = service:purge(node, stanza.attr.from, notify);
+       if ok then
+               reply = st.reply(stanza);
+       else
+               reply = pubsub_error_reply(stanza, ret);
+       end
+       return origin.send(reply);
+end
+
+function simple_broadcast(kind, node, jids, item)
+       if item then
+               item = st.clone(item);
+               item.attr.xmlns = nil; -- Clear the pubsub namespace
+       end
        local message = st.message({ from = module.host, type = "headline" })
                :tag("event", { xmlns = xmlns_pubsub_event })
-                       :tag("items", { node = node })
+                       :tag(kind, { node = node })
                                :add_child(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
 
-module:hook("iq/host/http://jabber.org/protocol/pubsub:pubsub", handle_pubsub_iq);
+module:hook("iq/host/"..xmlns_pubsub..":pubsub", handle_pubsub_iq);
+module:hook("iq/host/"..xmlns_pubsub_owner..":pubsub", handle_pubsub_iq);
 
 local disco_info;
 
 local feature_map = {
-       create = { "create-nodes", autocreate_on_publish and "instant-nodes", "item-ids" };
+       create = { "create-nodes", "instant-nodes", "item-ids" };
        retract = { "delete-items", "retract-items" };
-       publish = { "publish" };
+       purge = { "purge-nodes" };
+       publish = { "publish", autocreate_on_publish and "auto-create" };
+       delete = { "delete-nodes" };
        get_items = { "retrieve-items" };
        add_subscription = { "subscribe" };
        get_subscriptions = { "retrieve-subscriptions" };
@@ -224,7 +298,7 @@ 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;
@@ -260,7 +334,7 @@ local function handle_disco_items_on_node(event)
        end
        
        local reply = st.reply(stanza)
-               :tag("query", { xmlns = "http://jabber.org/protocol/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();
@@ -276,7 +350,7 @@ module:hook("iq-get/host/http://jabber.org/protocol/disco#items:query", function
        end
        local ok, ret = service:get_nodes(event.stanza.attr.from);
        if not ok then
-               event.origin.send(pubsub_error_reply(stanza, ret));
+               event.origin.send(pubsub_error_reply(event.stanza, ret));
        else
                local reply = st.reply(event.stanza)
                        :tag("query", { xmlns = "http://jabber.org/protocol/disco#items" });
@@ -334,10 +408,33 @@ 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;
                        retract = true;
+                       delete = true;
                        get_nodes = true;
                        
                        subscribe = true;