Comparison

mod_blocklist: Drop messages to existing full JIDs in order to prevent issues with MUC PMs, fixes #690

comparison

equal deleted inserted replaced

-:3798955049e3
+:13dad833e821
 local jid_prep = require"util.jid".prep;
 local jid_split = require"util.jid".split;
 local storage = module:open_store();
 local sessions = prosody.hosts[module.host].sessions;
+local full_sessions = prosody.full_sessions;
 -- First level cache of blocklists by username.
 -- Weak table so may randomly expire at any time.
 local cache = setmetatable({}, { __mode = "v" });
 	end
 	return drop_stanza(event); -- result or error
 end
 local function bounce_message(event)
-	local type = event.stanza.attr.type;
+	local stanza = event.stanza;
+	local type = stanza.attr.type;
 	if type == "chat" or not type or type == "normal" then
+		if full_sessions[stanza.attr.to] then
+			-- See #690
+			return drop_stanza(event);
+		end
 		return bounce_stanza(event);
 	end
 	return drop_stanza(event); -- drop headlines, groupchats etc
 end
 -- Hook all the events!
 local prio_in, prio_out = 100, 100;
 module:hook("presence/bare", drop_stanza, prio_in);
 module:hook("presence/full", drop_stanza, prio_in);
--- FIXME See #690
 module:hook("message/bare", bounce_message, prio_in);
 module:hook("message/full", bounce_message, prio_in);
 module:hook("iq/bare", bounce_iq, prio_in);
 module:hook("iq/full", bounce_iq, prio_in);