--- a/plugins/mod_dialback.lua Fri May 04 02:28:10 2012 +0100
+++ b/plugins/mod_dialback.lua Thu May 10 22:59:01 2012 +0100
@@ -64,28 +64,29 @@
-- he wants to be identified through dialback
-- We need to check the key with the Authoritative server
local attr = stanza.attr;
- origin.hosts[attr.from] = { dialback_key = stanza[1] };
+ local to, from = attr.to, attr.from;
+
+ origin.hosts[from] = { dialback_key = stanza[1] };
- if not hosts[attr.to] then
+ if not hosts[to] then
-- Not a host that we serve
- origin.log("info", "%s tried to connect to %s, which we don't serve", attr.from, attr.to);
+ origin.log("info", "%s tried to connect to %s, which we don't serve", from, to);
origin:close("host-unknown");
return true;
end
- dialback_requests[attr.from.."/"..origin.streamid] = origin;
+ dialback_requests[from.."/"..origin.streamid] = origin;
- if not origin.from_host then
- -- Just used for friendlier logging
- origin.from_host = attr.from;
- end
- if not origin.to_host then
- -- Just used for friendlier logging
- origin.to_host = attr.to;
- end
+ -- 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
- origin.log("debug", "asking %s if key %s belongs to them", attr.from, stanza[1]);
- origin.send(st.stanza("db:verify", { from = attr.to, to = attr.from, id = origin.streamid }):text(stanza[1]));
+ origin.log("debug", "asking %s if key %s belongs to them", from, stanza[1]);
+ module:fire_event("route/remote", {
+ from_host = to, to_host = from;
+ stanza = st.stanza("db:verify", { from = to, to = from, id = origin.streamid }):text(stanza[1]);
+ });
return true;
end
end);