From 037b0a7599a6f511be931198a907c5ab9e676fd0 Mon Sep 17 00:00:00 2001 From: firest Date: Mon, 21 Aug 2023 22:47:18 +0800 Subject: [PATCH] fix(ldap): Return correct reason code when password is wrong --- apps/emqx_ldap/src/emqx_ldap_authn.erl | 2 +- apps/emqx_ldap/test/emqx_ldap_authn_SUITE.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/emqx_ldap/src/emqx_ldap_authn.erl b/apps/emqx_ldap/src/emqx_ldap_authn.erl index d814e2aae..8d7997567 100644 --- a/apps/emqx_ldap/src/emqx_ldap_authn.erl +++ b/apps/emqx_ldap/src/emqx_ldap_authn.erl @@ -249,7 +249,7 @@ verify_password(Algorithm, LDAPPasswordType, LDAPPassword, Salt, Position, Passw true -> {ok, is_superuser(Entry, State)}; _ -> - {error, invalid_password} + {error, bad_username_or_password} end. is_superuser(Entry, #{is_superuser_attribute := Attr} = _State) -> diff --git a/apps/emqx_ldap/test/emqx_ldap_authn_SUITE.erl b/apps/emqx_ldap/test/emqx_ldap_authn_SUITE.erl index 5167d2267..40501456e 100644 --- a/apps/emqx_ldap/test/emqx_ldap_authn_SUITE.erl +++ b/apps/emqx_ldap/test/emqx_ldap_authn_SUITE.erl @@ -237,7 +237,7 @@ user_seeds() -> %% Not exists New(<<"notexists">>, <<"notexists">>, {error, not_authorized}), %% Wrong Password - New(<<"mqttuser0001">>, <<"wrongpassword">>, {error, invalid_password}), + New(<<"mqttuser0001">>, <<"wrongpassword">>, {error, bad_username_or_password}), %% Disabled New(<<"mqttuser0006">>, <<"mqttuser0006">>, {error, user_disabled}), %% IsSuperuser