prosody: Enable storage manager.

[prosody.git] / plugins / mod_disco.lua

diff --git a/plugins/mod_disco.lua b/plugins/mod_disco.lua
index ee0043f1d223455e9637c8aac00b0792e73dfe83..8bb0afec58ade2e8e6090db527c745a104aca53b 100644 (file)
--- a/plugins/mod_disco.lua
+++ b/plugins/mod_disco.lua
@@ -11,6 +11,7 @@ local is_contact_subscribed = require "core.rostermanager".is_contact_subscribed
 local jid_split = require "util.jid".split;
 local jid_bare = require "util.jid".bare;
 local st = require "util.stanza"
+local calculate_hash = require "util.caps".calculate_hash;
 
 local disco_items = module:get_option("disco_items") or {};
 do -- validate disco_items
@@ -35,27 +36,61 @@ module:add_identity("server", "im", "Prosody"); -- FIXME should be in the non-ex
 module:add_feature("http://jabber.org/protocol/disco#info");
 module:add_feature("http://jabber.org/protocol/disco#items");
 
-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 ~= "" then return; end -- TODO fire event?
-
-       local reply = st.reply(stanza):query("http://jabber.org/protocol/disco#info");
+-- Generate and cache disco result and caps hash
+local _cached_server_disco_info, _cached_server_caps_feature, _cached_server_caps_hash;
+local function build_server_disco_info()
+       local query = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info" });
        local done = {};
        for _,identity in ipairs(module:get_host_items("identity")) do
                local identity_s = identity.category.."\0"..identity.type;
                if not done[identity_s] then
-                       reply:tag("identity", identity):up();
+                       query:tag("identity", identity):up();
                        done[identity_s] = true;
                end
        end
        for _,feature in ipairs(module:get_host_items("feature")) do
                if not done[feature] then
-                       reply:tag("feature", {var=feature}):up();
+                       query:tag("feature", {var=feature}):up();
                        done[feature] = true;
                end
        end
+       _cached_server_disco_info = query;
+       _cached_server_caps_hash = calculate_hash(query);
+       _cached_server_caps_feature = st.stanza("c", {
+               xmlns = "http://jabber.org/protocol/caps";
+               hash = "sha-1";
+               node = "http://prosody.im";
+               ver = _cached_server_caps_hash;
+       });
+end
+local function clear_disco_cache()
+       _cached_server_disco_info, _cached_server_caps_feature, _cached_server_caps_hash = nil, nil, nil;
+end
+local function get_server_disco_info()
+       if not _cached_server_disco_info then build_server_disco_info(); end
+       return _cached_server_disco_info;
+end
+local function get_server_caps_feature()
+       if not _cached_server_caps_feature then build_server_disco_info(); end
+       return _cached_server_caps_feature;
+end
+local function get_server_caps_hash()
+       if not _cached_server_caps_hash then build_server_disco_info(); end
+       return _cached_server_caps_hash;
+end
+
+module:hook("item-added/identity", clear_disco_cache);
+module:hook("item-added/feature", 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?
+       local reply_query = get_server_disco_info();
+       reply_query.node = node;
+       local reply = st.reply(stanza):add_child(reply_query);
        origin.send(reply);
        return true;
 end);
@@ -75,6 +110,13 @@ module:hook("iq/host/http://jabber.org/protocol/disco#items:query", function(eve
        origin.send(reply);
        return true;
 end);
+
+-- Handle caps stream feature
+module:hook("stream-features", function (event)
+       event.features:add_child(get_server_caps_feature());
+end);
+
+-- Handle disco requests to user accounts
 module:hook("iq/bare/http://jabber.org/protocol/disco#info:query", function(event)
        local origin, stanza = event.origin, event.stanza;
        if stanza.attr.type ~= "get" then return; end