mod_disco: Handle and fire events for service discovery queries for bare account JIDs (thanks darkrain).

1 files changed, 31 insertions, 0 deletions

diff --git a/plugins/mod_disco.lua b/plugins/mod_disco.lua
index 06b29f0e..a96472c4 100644
--- a/plugins/mod_disco.lua
+++ b/plugins/mod_disco.lua
@@ -7,6 +7,9 @@
 --
 
 local componentmanager_get_children = require "core.componentmanager".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"
 
 module:add_identity("server", "im", "Prosody"); -- FIXME should be in the non-existing mod_router
@@ -50,3 +53,31 @@ module:hook("iq/host/http://jabber.org/protocol/disco#items:query", function(eve
 	origin.send(reply);
 	return true;
 end);
+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
+	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
+		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 });
+		origin.send(reply);
+		return true;
+	end
+end);
+module:hook("iq/bare/http://jabber.org/protocol/disco#items: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 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
+		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 });
+		origin.send(reply);
+		return true;
+	end
+end);