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

fix(emqx_dashboard_admin): put changed default user pwd in pt 

plugin app envs are all unloaded when the app reboots
This commit is contained in:
Zaiming (Stone) Shi 2022-04-05 13:56:43 +02:00
parent 155befe418
commit d219e475fb
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib-ce/emqx_dashboard/src/emqx_dashboard_admin.erl
View File

@ -201,7 +201,7 @@ init([]) ->
%% Add default admin user %% Add default admin user
{ok, _} = mnesia:subscribe({table, mqtt_admin, simple}), {ok, _} = mnesia:subscribe({table, mqtt_admin, simple}),
PasswordHash = ensure_default_user_in_db(binenv(default_user_username)), PasswordHash = ensure_default_user_in_db(binenv(default_user_username)),
ok = ensure_default_user_passwd_hashed_in_app_env(PasswordHash), ok = ensure_default_user_passwd_hashed_in_pt(PasswordHash),
ok = maybe_warn_default_pwd(), ok = maybe_warn_default_pwd(),
{ok, state}. {ok, state}.
@ -212,11 +212,11 @@ handle_cast(_Msg, State) ->
{noreply, State}. {noreply, State}.
handle_info({mnesia_table_event, {write, Admin, _}}, State) -> handle_info({mnesia_table_event, {write, Admin, _}}, State) ->
%% the password is chagned from another node, sync it to app env %% the password is chagned from another node, sync it to persistent_term
#mqtt_admin{username = Username, password = HashedPassword} = Admin, #mqtt_admin{username = Username, password = HashedPassword} = Admin,
case binenv(default_user_username) of case binenv(default_user_username) of
Username -> Username ->
ok = ensure_default_user_passwd_hashed_in_app_env(HashedPassword); ok = ensure_default_user_passwd_hashed_in_pt(HashedPassword);
_ -> _ ->
ignore ignore
end, end,
@ -269,7 +269,7 @@ ensure_default_user_in_db(Username) ->
PwdHash. PwdHash.
initial_default_user_passwd_hashed() -> initial_default_user_passwd_hashed() ->
case get_default_user_passwd_hashed_in_app_env() of case get_default_user_passwd_hashed_from_pt() of
Empty when ?EMPTY_KEY(Empty) -> Empty when ?EMPTY_KEY(Empty) ->
%% in case it's not set yet %% in case it's not set yet
case binenv(default_user_passwd) of case binenv(default_user_passwd) of
@ -282,14 +282,14 @@ initial_default_user_passwd_hashed() ->
PwdHash PwdHash
end. end.
%% use this app env for a copy of the value in mnesia database %% use this persistent_term for a copy of the value in mnesia database
%% so that after the node leaves a cluster, db gets purged, %% so that after the node leaves a cluster, db gets purged,
%% we can still find the changed password back from this app env %% we can still find the changed password back from PT
ensure_default_user_passwd_hashed_in_app_env(Hashed) -> ensure_default_user_passwd_hashed_in_pt(Hashed) ->
ok = application:set_env(emqx_dashboard, default_user_passwd_hashed, Hashed). ok = persistent_term:put({?MODULE, default_user_passwd_hashed}, Hashed).
get_default_user_passwd_hashed_in_app_env() -> get_default_user_passwd_hashed_from_pt() ->
application:get_env(emqx_dashboard, default_user_passwd_hashed, <<>>). persistent_term:get({?MODULE, default_user_passwd_hashed}, <<>>).
maybe_warn_default_pwd() -> maybe_warn_default_pwd() ->
case is_valid_pwd(initial_default_user_passwd_hashed(), <<"public">>) of case is_valid_pwd(initial_default_user_passwd_hashed(), <<"public">>) of