mod_auth_internal_hashed: Log calls to provider methods and be consistent with mod_au...

[prosody.git] / plugins / mod_disco.lua

diff --git a/plugins/mod_disco.lua b/plugins/mod_disco.lua
index 907ca7531c6561af5e4128035a77a9f42edfd041..617495801e37497794c500699745d309fc108b18 100644 (file)
--- a/plugins/mod_disco.lua
+++ b/plugins/mod_disco.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -32,7 +32,9 @@ do -- validate disco_items
        end
 end
 
-module:add_identity("server", "im", "Prosody"); -- FIXME should be in the non-existing mod_router
+if module:get_host_type() == "local" then
+       module:add_identity("server", "im", module:get_option_string("name", "Prosody")); -- FIXME should be in the non-existing mod_router
+end
 module:add_feature("http://jabber.org/protocol/disco#info");
 module:add_feature("http://jabber.org/protocol/disco#items");
 
@@ -54,6 +56,12 @@ local function build_server_disco_info()
                        done[feature] = true;
                end
        end
+       for _,extension in ipairs(module:get_host_items("extension")) do
+               if not done[extension] then
+                       query:add_child(extension);
+                       done[extension] = true;
+               end
+       end
        _cached_server_disco_info = query;
        _cached_server_caps_hash = calculate_hash(query);
        _cached_server_caps_feature = st.stanza("c", {
@@ -81,15 +89,28 @@ end
 
 module:hook("item-added/identity", clear_disco_cache);
 module:hook("item-added/feature", clear_disco_cache);
+module:hook("item-added/extension", clear_disco_cache);
 module:hook("item-removed/identity", clear_disco_cache);
 module:hook("item-removed/feature", clear_disco_cache);
+module:hook("item-removed/extension", clear_disco_cache);
 
 -- Handle disco requests to the server
 module:hook("iq/host/http://jabber.org/protocol/disco#info:query", function(event)
        local origin, stanza = event.origin, event.stanza;
        if stanza.attr.type ~= "get" then return; end
        local node = stanza.tags[1].attr.node;
-       if node and node ~= "" and node ~= "http://prosody.im#"..get_server_caps_hash() then return; end -- TODO fire event?
+       if node and node ~= "" and node ~= "http://prosody.im#"..get_server_caps_hash() then
+               local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#info', node=node});
+               local event = { origin = origin, stanza = stanza, reply = reply, node = node, exists = false};
+               local ret = module:fire_event("host-disco-info-node", event);
+               if ret ~= nil then return ret; end
+               if event.exists then
+                       origin.send(reply);
+               else
+                       origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Node does not exist"));
+               end
+               return true;
+       end
        local reply_query = get_server_disco_info();
        reply_query.node = node;
        local reply = st.reply(stanza):add_child(reply_query);
@@ -100,11 +121,23 @@ module:hook("iq/host/http://jabber.org/protocol/disco#items:query", function(eve
        local origin, stanza = event.origin, event.stanza;
        if stanza.attr.type ~= "get" then return; end
        local node = stanza.tags[1].attr.node;
-       if node and node ~= "" then return; end -- TODO fire event?
-
+       if node and node ~= "" then
+               local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#items', node=node});
+               local event = { origin = origin, stanza = stanza, reply = reply, node = node, exists = false};
+               local ret = module:fire_event("host-disco-items-node", event);
+               if ret ~= nil then return ret; end
+               if event.exists then
+                       origin.send(reply);
+               else
+                       origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Node does not exist"));
+               end
+               return true;
+       end
        local reply = st.reply(stanza):query("http://jabber.org/protocol/disco#items");
-       for jid in pairs(get_children(module.host)) do
-               reply:tag("item", {jid = jid}):up();
+       local ret = module:fire_event("host-disco-items", { origin = origin, stanza = stanza, reply = reply });
+       if ret ~= nil then return ret; end
+       for jid, name in pairs(get_children(module.host)) do
+               reply:tag("item", {jid = jid, name = name~=true and name or nil}):up();
        end
        for _, item in ipairs(disco_items) do
                reply:tag("item", {jid=item[1], name=item[2]}):up();
@@ -125,12 +158,24 @@ module:hook("iq/bare/http://jabber.org/protocol/disco#info:query", function(even
        local origin, stanza = event.origin, event.stanza;
        if stanza.attr.type ~= "get" then return; end
        local node = stanza.tags[1].attr.node;
-       if node and node ~= "" then return; end -- TODO fire event?
        local username = jid_split(stanza.attr.to) or origin.username;
        if not stanza.attr.to or is_contact_subscribed(username, module.host, jid_bare(stanza.attr.from)) then
+               if node and node ~= "" then
+                       local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#info', node=node});
+                       if not reply.attr.from then reply.attr.from = origin.username.."@"..origin.host; end -- COMPAT To satisfy Psi when querying own account
+                       local event = { origin = origin, stanza = stanza, reply = reply, node = node, exists = false};
+                       local ret = module:fire_event("account-disco-info-node", event);
+                       if ret ~= nil then return ret; end
+                       if event.exists then
+                               origin.send(reply);
+                       else
+                               origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Node does not exist"));
+                       end
+                       return true;
+               end
                local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#info'});
                if not reply.attr.from then reply.attr.from = origin.username.."@"..origin.host; end -- COMPAT To satisfy Psi when querying own account
-               module:fire_event("account-disco-info", { origin = origin, stanza = reply });
+               module:fire_event("account-disco-info", { origin = origin, reply = reply });
                origin.send(reply);
                return true;
        end
@@ -139,12 +184,24 @@ module:hook("iq/bare/http://jabber.org/protocol/disco#items:query", function(eve
        local origin, stanza = event.origin, event.stanza;
        if stanza.attr.type ~= "get" then return; end
        local node = stanza.tags[1].attr.node;
-       if node and node ~= "" then return; end -- TODO fire event?
        local username = jid_split(stanza.attr.to) or origin.username;
        if not stanza.attr.to or is_contact_subscribed(username, module.host, jid_bare(stanza.attr.from)) then
+               if node and node ~= "" then
+                       local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#items', node=node});
+                       if not reply.attr.from then reply.attr.from = origin.username.."@"..origin.host; end -- COMPAT To satisfy Psi when querying own account
+                       local event = { origin = origin, stanza = stanza, reply = reply, node = node, exists = false};
+                       local ret = module:fire_event("account-disco-items-node", event);
+                       if ret ~= nil then return ret; end
+                       if event.exists then
+                               origin.send(reply);
+                       else
+                               origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Node does not exist"));
+                       end
+                       return true;
+               end
                local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#items'});
                if not reply.attr.from then reply.attr.from = origin.username.."@"..origin.host; end -- COMPAT To satisfy Psi when querying own account
-               module:fire_event("account-disco-items", { origin = origin, stanza = reply });
+               module:fire_event("account-disco-items", { origin = origin, stanza = stanza, reply = reply });
                origin.send(reply);
                return true;
        end