Merge 0.9->0.10

[prosody.git] / plugins / mod_dialback.lua

diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index 8d2bbd8f335a91c5ca3f843d4f2f1f742820ea9a..2584299c0ff681b01ea974730e25a95c3e9cc62d 100644 (file)
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -13,13 +13,26 @@ local log = module._log;
 local st = require "util.stanza";
 local sha256_hash = require "util.hashes".sha256;
 local nameprep = require "util.encodings".stringprep.nameprep;
+local check_cert_status = module:depends"s2s".check_cert_status;
+local uuid_gen = require"util.uuid".generate;
 
 local xmlns_stream = "http://etherx.jabber.org/streams";
 
 local dialback_requests = setmetatable({}, { __mode = 'v' });
 
+local dialback_secret = module.host .. module:get_option_string("dialback_secret", uuid_gen());
+local dwd = module:get_option_boolean("dialback_without_dialback", false);
+
+function module.save()
+       return { dialback_secret = dialback_secret };
+end
+
+function module.restore(state)
+       dialback_secret = state.dialback_secret;
+end
+
 function generate_dialback(id, to, from)
-       return sha256_hash(id..to..from..hosts[from].dialback_secret, true);
+       return sha256_hash(id..to..dialback_secret, true);
 end
 
 function initiate_dialback(session)
@@ -69,6 +82,16 @@ module:hook("stanza/jabber:server:dialback:result", function(event)
                local attr = stanza.attr;
                local to, from = nameprep(attr.to), nameprep(attr.from);
 
+               if dwd and origin.secure then
+                       if check_cert_status(origin, from) == false then
+                               return
+                       elseif origin.cert_chain_status == "valid" and origin.cert_identity_status == "valid" then
+                               origin.sends2s(st.stanza("db:result", { to = from, from = to, id = attr.id, type = "valid" }));
+                               module:fire_event("s2s-authenticated", { session = origin, host = from });
+                               return true;
+                       end
+               end
+
                if not hosts[to] then
                        -- Not a host that we serve
                        origin.log("warn", "%s tried to connect to %s, which we don't serve", from, to);