Merge 0.7->trunk

[prosody.git] / plugins / mod_dialback.lua

diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index a0e3f12c6c0551ce5220dd166ebce0a6e88da464..189aeb363c5f30a95ade745334dcac28500038ac 100644 (file)
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -1,22 +1,24 @@
--- Prosody IM v0.3
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
 
-
+local hosts = _G.hosts;
 local send_s2s = require "core.s2smanager".send_to_host;
 local s2s_make_authenticated = require "core.s2smanager".make_authenticated;
+local s2s_initiate_dialback = require "core.s2smanager".initiate_dialback;
 local s2s_verify_dialback = require "core.s2smanager".verify_dialback;
 local s2s_destroy_session = require "core.s2smanager".destroy_session;
 
-local st = require "util.stanza";
+local log = module._log;
 
-local log = require "util.logger".init("mod_dialback");
+local st = require "util.stanza";
 
+local xmlns_stream = "http://etherx.jabber.org/streams";
 local xmlns_dialback = "jabber:server:dialback";
 
 local dialback_requests = setmetatable({}, { __mode = 'v' });
@@ -24,18 +26,18 @@ local dialback_requests = setmetatable({}, { __mode = 'v' });
 module:add_handler({"s2sin_unauthed", "s2sin"}, "verify", xmlns_dialback,
        function (origin, stanza)
                -- We are being asked to verify the key, to ensure it was generated by us
-               log("debug", "verifying dialback key...");
+               origin.log("debug", "verifying that dialback key is ours...");
                local attr = stanza.attr;
-               -- FIXME: Grr, ejabberd breaks this one too?? it is black and white in XEP-220 example 34
+               -- COMPAT: Grr, ejabberd breaks this one too?? it is black and white in XEP-220 example 34
                --if attr.from ~= origin.to_host then error("invalid-from"); end
                local type;
                if s2s_verify_dialback(attr.id, attr.from, attr.to, stanza[1]) then
                        type = "valid"
                else
                        type = "invalid"
-                       log("warn", "Asked to verify a dialback key that was incorrect. An imposter is claiming to be %s?", attr.to);
+                       origin.log("warn", "Asked to verify a dialback key that was incorrect. An imposter is claiming to be %s?", attr.to);
                end
-               log("debug", "verified dialback key... it is %s", type);
+               origin.log("debug", "verified dialback key... it is %s", type);
                origin.sends2s(st.stanza("db:verify", { from = attr.to, to = attr.from, id = attr.id, type = type }):text(stanza[1]));
        end);
 
@@ -48,7 +50,7 @@ module:add_handler({ "s2sin_unauthed", "s2sin" }, "result", xmlns_dialback,
                
                if not hosts[attr.to] then
                        -- Not a host that we serve
-                       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", attr.from, attr.to);
                        origin:close("host-unknown");
                        return;
                end
@@ -64,7 +66,7 @@ module:add_handler({ "s2sin_unauthed", "s2sin" }, "result", xmlns_dialback,
                        origin.to_host = attr.to;
                end
                
-               log("debug", "asking %s if key %s belongs to them", attr.from, stanza[1]);
+               origin.log("debug", "asking %s if key %s belongs to them", attr.from, stanza[1]);
                send_s2s(attr.to, attr.from,
                        st.stanza("db:verify", { from = attr.to, to = attr.from, id = origin.streamid }):text(stanza[1]));
        end);
@@ -113,3 +115,13 @@ module:add_handler({ "s2sout_unauthed", "s2sout" }, "result", xmlns_dialback,
                        s2s_destroy_session(origin)
                end
        end);
+
+module:hook_stanza(xmlns_stream, "features", function (origin, stanza)
+               s2s_initiate_dialback(origin);
+               return true;
+       end, 100);
+
+-- Offer dialback to incoming hosts
+module:hook("s2s-stream-features", function (data)
+               data.features:tag("dialback", { xmlns='urn:xmpp:features:dialback' }):tag("optional"):up():up();
+       end);