From 3ae26c8a547b82a37da8e3c46ea61ae0893c301e Mon Sep 17 00:00:00 2001 From: firest Date: Thu, 6 Jun 2024 16:42:43 +0800 Subject: [PATCH] chore: update changes --- .../src/emqx_authz_api_mnesia.erl | 16 ++-------------- changes/ce/fix-13196.en.md | 1 + 2 files changed, 3 insertions(+), 14 deletions(-) create mode 100644 changes/ce/fix-13196.en.md diff --git a/apps/emqx_auth_mnesia/src/emqx_authz_api_mnesia.erl b/apps/emqx_auth_mnesia/src/emqx_authz_api_mnesia.erl index 88cb8ab63..0cefe929d 100644 --- a/apps/emqx_auth_mnesia/src/emqx_authz_api_mnesia.erl +++ b/apps/emqx_auth_mnesia/src/emqx_authz_api_mnesia.erl @@ -487,7 +487,7 @@ users(post, #{body := Body}) when is_list(Body) -> {error, {already_exists, Exists}} -> {409, #{ code => <<"ALREADY_EXISTS">>, - message => binfmt("User '~ts' already exist", [binjoin(Exists)]) + message => binfmt("User '~ts' already exist", [Exists]) }} end. @@ -531,7 +531,7 @@ clients(post, #{body := Body}) when is_list(Body) -> {error, {already_exists, Exists}} -> {409, #{ code => <<"ALREADY_EXISTS">>, - message => binfmt("Client '~ts' already exist", [binjoin(Exists)]) + message => binfmt("Client '~ts' already exist", [Exists]) }} end. @@ -762,16 +762,4 @@ ensure_rules_is_valid(Key, Type, MaxLen, [Cfg | Cfgs]) -> ensure_rules_is_valid(_Key, _Type, _MaxLen, []) -> ok. -binjoin([Bin]) -> - Bin; -binjoin(Bins) when is_list(Bins) -> - binjoin(Bins, <<>>); -binjoin(Bin) -> - Bin. - -binjoin([H | T], Acc) -> - binjoin(T, <>); -binjoin([], Acc) -> - Acc. - binfmt(Fmt, Args) -> iolist_to_binary(io_lib:format(Fmt, Args)). diff --git a/changes/ce/fix-13196.en.md b/changes/ce/fix-13196.en.md new file mode 100644 index 000000000..b0fed0eae --- /dev/null +++ b/changes/ce/fix-13196.en.md @@ -0,0 +1 @@ +In the built-in database of authorization, added a limit for the length of rules per client/user, and the default values is 100.