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

Merge with Maranda

Browse source
This commit is contained in:
Matthew Wild 2012-05-11 01:53:32 +01:00
commit 703e7dde18
2 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
plugins/mod_dialback.lua
View file

@ -15,6 +15,7 @@ local log = module._log;
local st = require "util.stanza";
local sha256_hash = require "util.hashes".sha256;
local nameprep = require "util.encodings".stringprep.nameprep;
local xmlns_stream = "http://etherx.jabber.org/streams";
@ -79,8 +80,21 @@ module:hook("stanza/jabber:server:dialback:result", function(event)
-- COMPAT: ejabberd, gmail and perhaps others do not always set 'to' and 'from'
-- on streams. We fill in the session's to/from here instead.
if not origin.from_host then origin.from_host = from; end
if not origin.to_host then origin.to_host = to; end
if not origin.from_host then
origin.from_host = nameprep(attr.from);
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
origin.to_host = nameprep(attr.to);
end
if not origin.from_host and not origin.to_host then
origin.log("debug", "Improper addressing supplied, no to or from?");
origin:close("improper-addressing");
end
origin.log("debug", "asking %s if key %s belongs to them", from, stanza[1]);
module:fire_event("route/remote", {