mod_admin_adhoc: Fix node of the "Get List of Online Users" command

[prosody.git] / plugins / mod_pubsub.lua

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index 56fabaec68dad24f8166447bc72f2ed8ca16d228..926ed4f2e8ba483fec1c7ed930e64776d4c46671 100644 (file)
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -2,6 +2,7 @@ local pubsub = require "util.pubsub";
 local st = require "util.stanza";
 local jid_bare = require "util.jid".bare;
 local uuid_generate = require "util.uuid".generate;
+local usermanager = require "core.usermanager";
 
 local xmlns_pubsub = "http://jabber.org/protocol/pubsub";
 local xmlns_pubsub_errors = "http://jabber.org/protocol/pubsub#errors";
@@ -21,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);
@@ -31,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" };
@@ -49,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));
@@ -110,8 +119,27 @@ 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 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
@@ -136,20 +164,13 @@ function handlers.set_subscribe(origin, stanza, subscribe)
                reply = pubsub_error_reply(stanza, ret);
        end
        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 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;
        if ok then
@@ -162,8 +183,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
@@ -183,8 +213,7 @@ function handlers.set_retract(origin, stanza, retract)
        local item = retract:get_child("item");
        local id = item and item.attr.id
        if not (node and id) then
-               origin.send(st.error_reply(stanza, "modify", "bad-request"));
-               return true;
+               return origin.send(pubsub_error_reply(stanza, node and "item-not-found" or "nodeid-required"));
        end
        local reply, notifier;
        if notify then
@@ -204,8 +233,7 @@ function handlers.set_purge(origin, stanza, purge)
        notify = (notify == "1") or (notify == "true");
        local reply;
        if not node then
-               origin.send(st.error_reply(stanza, "modify", "bad-request"));
-               return true;
+               return origin.send(pubsub_error_reply(stanza, "nodeid-required"));
        end
        local ok, ret = service:purge(node, stanza.attr.from, notify);
        if ok then
@@ -242,6 +270,7 @@ local feature_map = {
        retract = { "delete-items", "retract-items" };
        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" };
@@ -318,7 +347,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" });
@@ -402,6 +431,7 @@ set_service(pubsub.new({
                        create = true;
                        publish = true;
                        retract = true;
+                       delete = true;
                        get_nodes = true;
                        
                        subscribe = true;