mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

prosody2ejabberd: Check for iteration count at position 6

Browse source 
In some data dumps, presumably from newer ejabberd versions, position 5 is
the string "sha", and the iteration count follows it.
This commit is contained in:
Matthew Wild 2021-10-07 13:02:28 +01:00
parent 7925b95a58
commit 8660ec61ce
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tools/ejabberd2prosody.lua
View file

@ -85,7 +85,13 @@ function password(node, host, password)
data.stored_key = hex(unb64(password[2]));
data.server_key = hex(unb64(password[3]));
data.salt = unb64(password[4]);
data.iteration_count = tonumber(password[5]);
if type(password[6]) == "number" then
assert(password[5] == "sha", "unexpected passwd entry hash: "..tostring(password[5]));
data.iteration_count = password[6];
else
assert(type(password[5]) == "number", "unexpected passwd entry in source data");
data.iteration_count = password[5];
end
end
local ret, err = dm.store(node, host, "accounts", data);
print("["..(err or "success").."] accounts: "..node.."@"..host);