fix: create banned & dashboard default user name
This commit is contained in:
parent
0a16c9fabf
commit
40560230db
|
@ -45,7 +45,9 @@
|
||||||
, verify_hash/2
|
, verify_hash/2
|
||||||
]).
|
]).
|
||||||
|
|
||||||
-export([add_default_user/0]).
|
-export([ add_default_user/0
|
||||||
|
, default_username/0
|
||||||
|
]).
|
||||||
|
|
||||||
-type emqx_admin() :: #?ADMIN{}.
|
-type emqx_admin() :: #?ADMIN{}.
|
||||||
|
|
||||||
|
@ -240,6 +242,9 @@ destroy_token_by_username(Username, Token) ->
|
||||||
add_default_user() ->
|
add_default_user() ->
|
||||||
add_default_user(binenv(default_username), binenv(default_password)).
|
add_default_user(binenv(default_username), binenv(default_password)).
|
||||||
|
|
||||||
|
default_username() ->
|
||||||
|
binenv(default_username).
|
||||||
|
|
||||||
binenv(Key) ->
|
binenv(Key) ->
|
||||||
iolist_to_binary(emqx_conf:get([dashboard, Key], "")).
|
iolist_to_binary(emqx_conf:get([dashboard, Key], "")).
|
||||||
|
|
||||||
|
|
|
@ -239,7 +239,7 @@ user(put, #{bindings := #{username := Username}, body := Params}) ->
|
||||||
end;
|
end;
|
||||||
|
|
||||||
user(delete, #{bindings := #{username := Username}}) ->
|
user(delete, #{bindings := #{username := Username}}) ->
|
||||||
case Username == <<"admin">> of
|
case Username == emqx_dashboard_admin:default_username() of
|
||||||
true ->
|
true ->
|
||||||
{400, #{code => <<"ACTION_NOT_ALLOWED">>,
|
{400, #{code => <<"ACTION_NOT_ALLOWED">>,
|
||||||
message => <<"Cannot delete admin">>}};
|
message => <<"Cannot delete admin">>}};
|
||||||
|
|
|
@ -159,7 +159,9 @@ banned(post, #{body := Body}) ->
|
||||||
Ban ->
|
Ban ->
|
||||||
case emqx_banned:create(Ban) of
|
case emqx_banned:create(Ban) of
|
||||||
{ok, Banned} -> {200, format(Banned)};
|
{ok, Banned} -> {200, format(Banned)};
|
||||||
{error, {already_exist, Old}} -> {400, 'ALREADY_EXISTS', format(Old)}
|
{error, {already_exist, Old}} ->
|
||||||
|
OldBannedFormat = emqx_json:encode(format(Old)),
|
||||||
|
{400, 'ALREADY_EXISTS', OldBannedFormat}
|
||||||
end
|
end
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue