aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-05-22 15:21:22 +0200
committerKim Alvefur <zash@zash.se>2014-05-22 15:21:22 +0200
commit105ceb9cffa82a84a2f1df4cb0659772f6930526 (patch)
treef5443dc1fe20882964d43b4f668b5c0c18cdd399
parent06f4d45553e972e9dc074afaa0098b07747cef5b (diff)
downloadprosody-105ceb9cffa82a84a2f1df4cb0659772f6930526.tar.gz
prosody-105ceb9cffa82a84a2f1df4cb0659772f6930526.zip
hostmanager, mod_dialback: Move generation of dialback secret out of core
-rw-r--r--core/hostmanager.lua1
-rw-r--r--plugins/mod_dialback.lua5
2 files changed, 4 insertions, 2 deletions
diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index 91b052d1..d10ecd30 100644
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -74,7 +74,6 @@ function activate(host, host_config)
host = host;
s2sout = {};
events = events_new();
- dialback_secret = configmanager.get(host, "dialback_secret") or uuid_gen();
send = host_send;
modules = {};
};
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index 8d2bbd8f..b32160c4 100644
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -13,13 +13,16 @@ local log = module._log;
local st = require "util.stanza";
local sha256_hash = require "util.hashes".sha256;
local nameprep = require "util.encodings".stringprep.nameprep;
+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());
+
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)