Software / code / prosody
Changeset
6798:8b4c8e957211
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 26 Aug 2015 13:17:10 +0200 |
| parents | 6796:87ec4e783ebd (current diff) 6797:509b70437035 (diff) |
| children | 6799:4fc6b0a090bb 6802:442019e955dc |
| files | tools/ejabberd2prosody.lua |
| diffstat | 1 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tools/ejabberd2prosody.lua Wed Aug 26 13:08:51 2015 +0200 +++ b/tools/ejabberd2prosody.lua Wed Aug 26 13:17:10 2015 +0200 @@ -72,7 +72,22 @@ print("["..(err or "success").."] vCard: "..node.."@"..host); end function password(node, host, password) - local ret, err = dm.store(node, host, "accounts", {password = password}); + local data = {}; + if type(password) == "string" then + data.password = password; + elseif type(password) == "table" and password[1] == "scram" then + local unb64 = require"mime".unb64; + local function hex(s) + return s:gsub(".", function (c) + return ("%02x"):format(c:byte()); + end); + end + data.stored_key = hex(unb64(password[2])); + data.server_key = hex(unb64(password[3])); + data.salt = unb64(password[4]); + data.iteration_count = password[5]; + end + local ret, err = dm.store(node, host, "accounts", data); print("["..(err or "success").."] accounts: "..node.."@"..host); end function roster(node, host, jid, item)
