projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b62dc0e
)
mod_dialback: Follow XEP-0185 and use HMAC
author
Kim Alvefur
<zash@zash.se>
Tue, 19 Jan 2016 20:31:02 +0000
(21:31 +0100)
committer
Kim Alvefur
<zash@zash.se>
Tue, 19 Jan 2016 20:31:02 +0000
(21:31 +0100)
plugins/mod_dialback.lua
patch
|
blob
|
history
diff --git
a/plugins/mod_dialback.lua
b/plugins/mod_dialback.lua
index 5dfd98394d9f6981542c45cefe5e601ba7240d8e..f0fe949aef8d2b91049dd32666da7a6b51187316 100644
(file)
--- a/
plugins/mod_dialback.lua
+++ b/
plugins/mod_dialback.lua
@@
-12,6
+12,7
@@
local log = module._log;
local st = require "util.stanza";
local sha256_hash = require "util.hashes".sha256;
local st = require "util.stanza";
local sha256_hash = require "util.hashes".sha256;
+local sha256_hmac = require "util.hashes".hmac_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 nameprep = require "util.encodings".stringprep.nameprep;
local check_cert_status = module:depends"s2s".check_cert_status;
local uuid_gen = require"util.uuid".generate;
@@
-20,7
+21,7
@@
local xmlns_stream = "http://etherx.jabber.org/streams";
local dialback_requests = setmetatable({}, { __mode = 'v' });
local dialback_requests = setmetatable({}, { __mode = 'v' });
-local dialback_secret =
module.host .. module:get_option_string("dialback_secret", uuid_gen()
);
+local dialback_secret =
sha256_hash(module:get_option_string("dialback_secret", uuid_gen()), true
);
local dwd = module:get_option_boolean("dialback_without_dialback", false);
function module.save()
local dwd = module:get_option_boolean("dialback_without_dialback", false);
function module.save()
@@
-32,7
+33,7
@@
function module.restore(state)
end
function generate_dialback(id, to, from)
end
function generate_dialback(id, to, from)
- return sha256_h
ash(id..to..dialback_secret
, true);
+ return sha256_h
mac(dialback_secret, to .. ' ' .. from .. ' ' .. id
, true);
end
function initiate_dialback(session)
end
function initiate_dialback(session)