yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ldap-sso): do not log error level when invalid user credentials

This commit is contained in:
Zaiming (Stone) Shi 2023-09-28 18:37:11 +02:00
parent 39820be5ff
commit b28e781c50
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_dashboard_sso/src/emqx_dashboard_sso_ldap.erl
View File

@ -131,8 +131,10 @@ login(
{bind, Entry#eldap_entry.object_name, Sign} {bind, Entry#eldap_entry.object_name, Sign}
) )
of of
ok -> {ok, #{result := ok}} ->
ensure_user_exists(Username); ensure_user_exists(Username);
{ok, #{result := invalidCredentials} = Reason} ->
{error, Reason};
{error, _} = Error -> {error, _} = Error ->
Error Error
end; end;

2
apps/emqx_ldap/src/emqx_ldap.erl
View File

@ -249,7 +249,7 @@ do_ldap_query(
#{pool_name := PoolName} = State #{pool_name := PoolName} = State
) -> ) ->
LogMeta = #{connector => InstId, search => SearchOptions, state => emqx_utils:redact(State)}, LogMeta = #{connector => InstId, search => SearchOptions, state => emqx_utils:redact(State)},
?TRACE("QUERY", "ldap_connector_received", LogMeta), ?TRACE("QUERY", "ldap_connector_received_query", LogMeta),
case case
ecpool:pick_and_do( ecpool:pick_and_do(
PoolName, PoolName,

4
apps/emqx_ldap/src/emqx_ldap_bind_worker.erl
View File

@ -80,7 +80,9 @@ on_query(
ldap_connector_query_return, ldap_connector_query_return,
#{result => ok} #{result => ok}
), ),
ok; {ok, #{result => ok}};
{error, invalidCredentials} ->
{ok, #{result => invalidCredentials}};
{error, Reason} -> {error, Reason} ->
?SLOG( ?SLOG(
error, error,