Merge 0.9->0.10

[prosody.git] / plugins / mod_dialback.lua

diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index b2f846034adb46b7005cac817de12db569e43801..8d2bbd8f335a91c5ca3f843d4f2f1f742820ea9a 100644 (file)
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -1,13 +1,12 @@
 -- 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 s2s_make_authenticated = require "core.s2smanager".make_authenticated;
 
 local log = module._log;
 
@@ -27,7 +26,7 @@ function initiate_dialback(session)
        -- generate dialback key
        session.dialback_key = generate_dialback(session.streamid, session.to_host, session.from_host);
        session.sends2s(st.stanza("db:result", { from = session.from_host, to = session.to_host }):text(session.dialback_key));
-       session.log("info", "sent dialback key on outgoing s2s stream");
+       session.log("debug", "sent dialback key on outgoing s2s stream");
 end
 
 function verify_dialback(id, to, from, key)
@@ -36,7 +35,7 @@ end
 
 module:hook("stanza/jabber:server:dialback:verify", function(event)
        local origin, stanza = event.origin, event.stanza;
-       
+
        if origin.type == "s2sin_unauthed" or origin.type == "s2sin" then
                -- We are being asked to verify the key, to ensure it was generated by us
                origin.log("debug", "verifying that dialback key is ours...");
@@ -63,26 +62,26 @@ end);
 
 module:hook("stanza/jabber:server:dialback:result", function(event)
        local origin, stanza = event.origin, event.stanza;
-       
+
        if origin.type == "s2sin_unauthed" or origin.type == "s2sin" then
                -- he wants to be identified through dialback
                -- We need to check the key with the Authoritative server
                local attr = stanza.attr;
                local to, from = nameprep(attr.to), nameprep(attr.from);
-               
+
                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", from, to);
+                       origin.log("warn", "%s tried to connect to %s, which we don't serve", from, to);
                        origin:close("host-unknown");
                        return true;
                elseif not from then
                        origin:close("improper-addressing");
                end
-               
+
                origin.hosts[from] = { dialback_key = stanza[1] };
-               
+
                dialback_requests[from.."/"..origin.streamid] = origin;
-               
+
                -- 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
@@ -103,14 +102,14 @@ end);
 
 module:hook("stanza/jabber:server:dialback:verify", function(event)
        local origin, stanza = event.origin, event.stanza;
-       
+
        if origin.type == "s2sout_unauthed" or origin.type == "s2sout" then
                local attr = stanza.attr;
                local dialback_verifying = dialback_requests[attr.from.."/"..(attr.id or "")];
                if dialback_verifying and attr.from == origin.to_host then
                        local valid;
                        if attr.type == "valid" then
-                               s2s_make_authenticated(dialback_verifying, attr.from);
+                               module:fire_event("s2s-authenticated", { session = dialback_verifying, host = attr.from });
                                valid = "valid";
                        else
                                -- Warn the original connection that is was not verified successfully
@@ -132,10 +131,10 @@ end);
 
 module:hook("stanza/jabber:server:dialback:result", function(event)
        local origin, stanza = event.origin, event.stanza;
-       
+
        if origin.type == "s2sout_unauthed" or origin.type == "s2sout" then
                -- Remote server is telling us whether we passed dialback
-               
+
                local attr = stanza.attr;
                if not hosts[attr.to] then
                        origin:close("host-unknown");
@@ -146,7 +145,7 @@ module:hook("stanza/jabber:server:dialback:result", function(event)
                        return true;
                end
                if stanza.attr.type == "valid" then
-                       s2s_make_authenticated(origin, attr.from);
+                       module:fire_event("s2s-authenticated", { session = origin, host = attr.from });
                else
                        origin:close("not-authorized", "dialback authentication failed");
                end
@@ -170,7 +169,7 @@ module:hook_stanza(xmlns_stream, "features", function (origin, stanza)
        end
 end, 100);
 
-module:hook("s2s-authenticate-legacy", function (event)
+module:hook("s2sout-authenticate-legacy", function (event)
        module:log("debug", "Initiating dialback...");
        initiate_dialback(event.origin);
        return true;