mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 14:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_dialback: add better safe then sorry nameprepping to the from attribute.

Browse source
This commit is contained in:
Marco Cirillo 2012-05-09 11:25:22 +00:00
parent 47594d8faf
commit a5e360e673
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/mod_dialback.lua
View file

@ -15,6 +15,7 @@ local log = module._log;
local st = require "util.stanza"; local st = require "util.stanza";
local sha256_hash = require "util.hashes".sha256; local sha256_hash = require "util.hashes".sha256;
local nameprep = require "util.encodings".stringprep.nameprep;
local xmlns_stream = "http://etherx.jabber.org/streams"; local xmlns_stream = "http://etherx.jabber.org/streams";
@ -77,11 +78,16 @@ module:hook("stanza/jabber:server:dialback:result", function(event)
if not origin.from_host then if not origin.from_host then
-- Just used for friendlier logging -- Just used for friendlier logging
origin.from_host = attr.from; origin.from_host = nameprep(attr.from);
-- COMPAT: Fix ejabberd chopness by resetting the send function -- COMPAT: Fix ejabberd chopness by resetting the send function
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");
else
origin.log("debug", "Remote server didn't specify a from attr, resetting session.send now that we know where to knock to."); origin.log("debug", "Remote server didn't specify a from attr, resetting session.send now that we know where to knock to.");
origin.send = function(stanza) hosts[attr.to].events.fire_event("route/remote", { from_host = origin.to_host, to_host = origin.from_host, stanza = stanza}); end origin.send = function(stanza) hosts[attr.to].events.fire_event("route/remote", { from_host = origin.to_host, to_host = origin.from_host, stanza = stanza}); end
end end
end
if not origin.to_host then if not origin.to_host then
-- Just used for friendlier logging -- Just used for friendlier logging
origin.to_host = attr.to; origin.to_host = attr.to;