25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00

Merge remote-tracking branch 'processone/pr/2446'

* processone/pr/2446:
  Fix authentication for usernames containing uppercase characters
This commit is contained in:
Holger Weiss 2018-05-30 20:53:11 +02:00
commit dacba3ec00

View File

@ -230,19 +230,22 @@ check_password_with_authmodule(User, AuthzId, Server, Password) ->
check_password_with_authmodule(User, AuthzId, Server, Password, Digest, DigestGen) -> check_password_with_authmodule(User, AuthzId, Server, Password, Digest, DigestGen) ->
case validate_credentials(User, Server) of case validate_credentials(User, Server) of
{ok, LUser, LServer} -> {ok, LUser, LServer} ->
lists:foldl( case jid:nodeprep(AuthzId) of
fun(Mod, false) -> error ->
case db_check_password( false;
LUser, AuthzId, LServer, Password, LAuthzId ->
lists:foldl(
fun(Mod, false) ->
case db_check_password(
LUser, LAuthzId, LServer, Password,
Digest, DigestGen, Mod) of Digest, DigestGen, Mod) of
true -> {true, Mod}; true -> {true, Mod};
false -> false false -> false
end; end;
(_, Acc) -> (_, Acc) ->
Acc Acc
end, false, auth_modules(LServer)); end, false, auth_modules(LServer))
_ -> end
false
end. end.
-spec set_password(binary(), binary(), password()) -> ok | {error, atom()}. -spec set_password(binary(), binary(), password()) -> ok | {error, atom()}.