X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_disco.lua;h=907ca7531c6561af5e4128035a77a9f42edfd041;hb=b9b20aa3f85ac7d9c5a8b0cce21b5b490969ceaf;hp=f7e51b83e3dbadaa1a5714fab2b3a3bf76d5d1da;hpb=332ebda71d7fa4771a8222664b3b8bf341109432;p=prosody.git

diff --git a/plugins/mod_disco.lua b/plugins/mod_disco.lua
index f7e51b83..907ca753 100644
--- a/plugins/mod_disco.lua
+++ b/plugins/mod_disco.lua
@@ -1,16 +1,17 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- 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.
 --
 
-local componentmanager_get_children = require "core.componentmanager".get_children;
+local get_children = require "core.hostmanager".get_children;
 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,63 @@ 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);
+module:hook("item-removed/identity", clear_disco_cache);
+module:hook("item-removed/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);
@@ -66,7 +103,7 @@ module:hook("iq/host/http://jabber.org/protocol/disco#items:query", function(eve
 	if node and node ~= "" then return; end -- TODO fire event?
 
 	local reply = st.reply(stanza):query("http://jabber.org/protocol/disco#items");
-	for jid in pairs(componentmanager_get_children(module.host)) do
+	for jid in pairs(get_children(module.host)) do
 		reply:tag("item", {jid = jid}):up();
 	end
 	for _, item in ipairs(disco_items) do
@@ -75,6 +112,15 @@ 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)
+	if event.origin.type == "c2s" then
+		event.features:add_child(get_server_caps_feature());
+	end
+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
@@ -84,7 +130,7 @@ module:hook("iq/bare/http://jabber.org/protocol/disco#info:query", function(even
 	if not stanza.attr.to or is_contact_subscribed(username, module.host, jid_bare(stanza.attr.from)) then
 		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", { session = origin, stanza = reply });
+		module:fire_event("account-disco-info", { origin = origin, stanza = reply });
 		origin.send(reply);
 		return true;
 	end
@@ -98,7 +144,7 @@ module:hook("iq/bare/http://jabber.org/protocol/disco#items:query", function(eve
 	if not stanza.attr.to or is_contact_subscribed(username, module.host, jid_bare(stanza.attr.from)) then
 		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", { session = origin, stanza = reply });
+		module:fire_event("account-disco-items", { origin = origin, stanza = reply });
 		origin.send(reply);
 		return true;
 	end