diff options
| author | Badlop <badlop@process-one.net> | 2011-08-16 19:26:18 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2011-08-16 19:29:30 +0200 |
| commit | 4a4a7afe227bc8ed0da77cb04bb1a1bb48762808 (patch) | |
| tree | 8685279faf089fbed7172adb83b9c88f1eca0a07 /src | |
| parent | New SASL authentication method: SCRAM-SHA-1 (thanks to Stephen Röttger)(EJAB... (diff) | |
Fix SCRAM code (EJAB-1196)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_auth_storage.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ejabberd_auth_storage.erl b/src/ejabberd_auth_storage.erl index 54a460823..c77dd2ce0 100644 --- a/src/ejabberd_auth_storage.erl +++ b/src/ejabberd_auth_storage.erl @@ -188,17 +188,17 @@ check_password(User, Server, Password, Digest, DigestGen) -> US = {LUser, LServer}, case catch gen_storage:dirty_read(LServer, {passwd, US}) of [#passwd{password = ""} = Passwd] -> - Passwd = base64:decode(Passwd#passwd.storedkey), + Storedkey = base64:decode(Passwd#passwd.storedkey), DigRes = if Digest /= "" -> - Digest == DigestGen(Passwd); + Digest == DigestGen(Storedkey); true -> false end, if DigRes -> true; true -> - (Passwd == Password) and (Password /= "") + (Storedkey == Password) and (Password /= "") end; [#passwd{password = Passwd}] -> DigRes = if @@ -589,10 +589,10 @@ scram_passwords(Host) -> end, scram_passwords(Host, Backend). scram_passwords(Host, mnesia) -> - ?INFO_MSG("Converting the passwords stored in odbc for host ~p into SCRAM bits", [Host]), + ?INFO_MSG("Converting the passwords stored in mnesia for host ~p into SCRAM bits", [Host]), gen_storage_migration:migrate_mnesia( Host, passwd, - [{passwd, [user_host, password, storedkey, serverkey, iterationcount, salt], + [{passwd, [user_host, password, storedkey, serverkey, salt, iterationcount], fun(#passwd{password = Password} = Passwd) -> password_to_scram(Password, Passwd) end}]); @@ -600,7 +600,7 @@ scram_passwords(Host, odbc) -> ?INFO_MSG("Converting the passwords stored in odbc for host ~p into SCRAM bits", [Host]), gen_storage_migration:migrate_odbc( Host, [passwd], - [{"passwd", ["user", "host", "password", "storedkey", "serverkey", "iterationcount", "salt"], + [{"passwd", ["user", "host", "password", "storedkey", "serverkey", "salt", "iterationcount"], fun(_, User, Host2, Password, _Storedkey, _Serverkey, _Iterationcount, _Salt) -> password_to_scram(Password, #passwd{user_host = {User, Host2}}) end}]). |