mod_dialback: Move d-w-d after to/from validation

[prosody.git] / plugins / mod_dialback.lua

diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index b32160c474c3c67b4391f0610985320a5d997280..4c5e3e4458dfdc9cccfcd8b61ece3f768e57298f 100644 (file)
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -13,13 +13,23 @@ 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") or uuid_gen());
+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..dialback_secret, true);
@@ -81,6 +91,16 @@ module:hook("stanza/jabber:server:dialback:result", function(event)
                        origin:close("improper-addressing");
                end
 
+               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
+
                origin.hosts[from] = { dialback_key = stanza[1] };
 
                dialback_requests[from.."/"..origin.streamid] = origin;