diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2022-08-04 09:33:07 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2022-08-04 09:33:07 +0200 |
| commit | 357d79fba6e93d4c10b88f5cbdb4f7b3187000b6 (patch) | |
| tree | 9f1999714f7cec1f4eacce04cfee9e209380c8f1 | |
| parent | 48421409e99dc933b4b32983459d134c1d54d044 (diff) | |
| download | rabbitmq-server-git-357d79fba6e93d4c10b88f5cbdb4f7b3187000b6.tar.gz | |
Follow-up to the revert in commit dcff9a219532b14119de93658a93c553b90cd3f2
Again, another change missed by the initial revert.
| -rw-r--r-- | deps/rabbit/src/rabbit_auth_backend_internal.erl | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/deps/rabbit/src/rabbit_auth_backend_internal.erl b/deps/rabbit/src/rabbit_auth_backend_internal.erl index cfa08387c2..645d2dbbd4 100644 --- a/deps/rabbit/src/rabbit_auth_backend_internal.erl +++ b/deps/rabbit/src/rabbit_auth_backend_internal.erl @@ -847,12 +847,16 @@ preconfigure_permissions(Username, Map, ActingUser) when is_map(Map) -> ok. set_user_limits(Username, Definition, ActingUser) when is_list(Definition); is_binary(Definition) -> - case rabbit_json:try_decode(rabbit_data_coercion:to_binary(Definition)) of - {ok, Term} -> - validate_parameters_and_update_limit(Username, Term, ActingUser); - {error, Reason} -> - {error_string, - rabbit_misc:format("Could not parse JSON document: ~tp", [Reason])} + case rabbit_feature_flags:is_enabled(user_limits) of + true -> + case rabbit_json:try_decode(rabbit_data_coercion:to_binary(Definition)) of + {ok, Term} -> + validate_parameters_and_update_limit(Username, Term, ActingUser); + {error, Reason} -> + {error_string, + rabbit_misc:format("Could not parse JSON document: ~tp", [Reason])} + end; + false -> {error_string, "cannot set any user limits: the user_limits feature flag is not enabled"} end; set_user_limits(Username, Definition, ActingUser) when is_map(Definition) -> case rabbit_feature_flags:is_enabled(user_limits) of |