aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_dialback.lua6
-rw-r--r--plugins/muc/muc.lib.lua6
2 files changed, 9 insertions, 3 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index f3b9e3cf..4b19f2d9 100644
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -80,8 +80,10 @@ module:hook("stanza/jabber:server:dialback:result", function(event)
if not origin.from_host then
-- Just used for friendlier logging
origin.from_host = nameprep(attr.from);
- -- COMPAT: Fix server's chopness by not including from
- compat_check = true;
+ if not origin.from_host then
+ origin.log("debug", "We need to know where to connect but remote server blindly refuses to tell us and to comply to specs, closing connection.");
+ origin:close("invalid-from");
+ end
end
if not origin.to_host then
-- Just used for friendlier logging
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 9be1736f..0203df26 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -744,7 +744,11 @@ function room_mt:handle_to_room(origin, stanza) -- presence changes and groupcha
local xmlns = stanza.tags[1] and stanza.tags[1].attr.xmlns;
if stanza.name == "iq" then
if xmlns == "http://jabber.org/protocol/disco#info" and type == "get" then
- origin.send(self:get_disco_info(stanza));
+ if stanza.tags[1].attr.node then
+ origin.send(st.error_reply(stanza, "cancel", "feature-not-implemented"));
+ else
+ origin.send(self:get_disco_info(stanza));
+ end
elseif xmlns == "http://jabber.org/protocol/disco#items" and type == "get" then
origin.send(self:get_disco_items(stanza));
elseif xmlns == "http://jabber.org/protocol/muc#admin" then