Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use sync_transaction when update admin/token #12111

Merged
merged 1 commit into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 9 additions & 5 deletions apps/emqx_dashboard/src/emqx_dashboard_admin.erl
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ add_user(Username, Password, Role, Desc) when is_binary(Username), is_binary(Pas
end.

do_add_user(Username, Password, Role, Desc) ->
Res = mria:transaction(?DASHBOARD_SHARD, fun add_user_/4, [Username, Password, Role, Desc]),
Res = mria:sync_transaction(?DASHBOARD_SHARD, fun add_user_/4, [Username, Password, Role, Desc]),
return(Res).

%% 0-9 or A-Z or a-z or $_
Expand Down Expand Up @@ -191,7 +191,7 @@ force_add_user(Username, Password, Role, Desc) ->
description = Desc
})
end,
case mria:transaction(?DASHBOARD_SHARD, AddFun) of
case mria:sync_transaction(?DASHBOARD_SHARD, AddFun) of
{atomic, ok} -> ok;
{aborted, Reason} -> {error, Reason}
end.
Expand Down Expand Up @@ -227,7 +227,7 @@ remove_user(Username) ->
_ -> mnesia:delete({?ADMIN, Username})
end
end,
case return(mria:transaction(?DASHBOARD_SHARD, Trans)) of
case return(mria:sync_transaction(?DASHBOARD_SHARD, Trans)) of
{ok, Result} ->
_ = emqx_dashboard_token:destroy_by_username(Username),
{ok, Result};
Expand All @@ -242,7 +242,11 @@ update_user(Username, Role, Desc) ->
ok ->
case
return(
mria:transaction(?DASHBOARD_SHARD, fun update_user_/3, [Username, Role, Desc])
mria:sync_transaction(
?DASHBOARD_SHARD,
fun update_user_/3,
[Username, Role, Desc]
)
)
of
{ok, {true, Result}} ->
Expand Down Expand Up @@ -324,7 +328,7 @@ update_pwd(Username, Fun) ->
end,
mnesia:write(Fun(User))
end,
return(mria:transaction(?DASHBOARD_SHARD, Trans)).
return(mria:sync_transaction(?DASHBOARD_SHARD, Trans)).

-spec lookup_user(dashboard_username()) -> [emqx_admin()].
lookup_user(Username) ->
Expand Down
6 changes: 3 additions & 3 deletions apps/emqx_dashboard/src/emqx_dashboard_token.erl
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ do_sign(#?ADMIN{username = Username} = User, Password) ->
{_, Token} = jose_jws:compact(Signed),
Role = emqx_dashboard_admin:role(User),
JWTRec = format(Token, Username, Role, ExpTime),
_ = mria:transaction(?DASHBOARD_SHARD, fun mnesia:write/1, [JWTRec]),
_ = mria:sync_transaction(?DASHBOARD_SHARD, fun mnesia:write/1, [JWTRec]),
{ok, Role, Token}.

-spec do_verify(_, Token :: binary()) ->
Expand All @@ -141,7 +141,7 @@ do_verify(Req, Token) ->

do_destroy(Token) ->
Fun = fun mnesia:delete/1,
{atomic, ok} = mria:transaction(?DASHBOARD_SHARD, Fun, [{?TAB, Token}]),
{atomic, ok} = mria:sync_transaction(?DASHBOARD_SHARD, Fun, [{?TAB, Token}]),
ok.

do_destroy_by_username(Username) ->
Expand Down Expand Up @@ -266,7 +266,7 @@ check_rbac(_Req, JWT) ->
save_new_jwt(OldJWT) ->
#?ADMIN_JWT{exptime = _ExpTime, extra = _Extra, username = Username} = OldJWT,
NewJWT = OldJWT#?ADMIN_JWT{exptime = jwt_expiration_time()},
{atomic, Res} = mria:transaction(
{atomic, Res} = mria:sync_transaction(
?DASHBOARD_SHARD,
fun mnesia:write/1,
[NewJWT]
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_management/src/emqx_mgmt_auth.erl
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ generate_unique_name(NamePrefix, ApiKey) ->
<<NamePrefix/binary, (hash_string_from_seed(ApiKey, ?DEFAULT_HASH_LEN))/binary>>.

trans(Fun, Args) ->
case mria:transaction(?COMMON_SHARD, Fun, Args) of
case mria:sync_transaction(?COMMON_SHARD, Fun, Args) of
{atomic, Res} -> {ok, Res};
{aborted, Error} -> {error, Error}
end.
Expand Down
1 change: 1 addition & 0 deletions changes/ce/fix-12111.en.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix an issue where API tokens were sometimes unavailable by using sync_transaction function to ensure all updates are consistently synchronized to the replica node.