From 105ceb9cffa82a84a2f1df4cb0659772f6930526 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 22 May 2014 15:21:22 +0200 Subject: hostmanager, mod_dialback: Move generation of dialback secret out of core --- core/hostmanager.lua | 1 - plugins/mod_dialback.lua | 5 ++++- 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) -- cgit v1.2.3