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

Merge pull request #11736 from keynslug/fix/eval-erl-audit 

fix(audit): handle abstract forms when logging `eval_erl`
This commit is contained in:
Andrew Mayorov 2023-10-10 15:49:19 +07:00 committed by GitHub
parent 24a68401d5 2a291dfd27
commit 9b573834f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/emqx_ctl/src/emqx_ctl.erl
View File

@ -331,14 +331,13 @@ safe_to_existing_atom(Str) ->
is_initialized() ->
ets:info(?CMD_TAB) =/= undefined.
audit_log(Level, From, Log = #{args := Args}) ->
audit_log(Level, From, Log) ->
case lookup_command(audit) of
{error, _} ->
ignore;
{ok, {Mod, Fun}} ->
try
Log1 = Log#{args => [unicode:characters_to_binary(A) || A <- Args]},
apply(Mod, Fun, [Level, From, Log1])
apply(Mod, Fun, [Level, From, normalize_audit_log_args(Log)])
catch
_:Reason:Stacktrace ->
?LOG_ERROR(#{
@ -349,12 +348,18 @@ audit_log(Level, From, Log = #{args := Args}) ->
end
end.
-define(TOO_SLOW, 3000).
audit_level(ok, _Duration) -> info;
audit_level({ok, _}, _Duration) -> info;
audit_level(_, _) -> error.
normalize_audit_log_args(Log = #{args := [Parsed | _] = Exprs, cmd := eval_erl}) when
is_tuple(Parsed)
->
String = erl_pp:exprs(Exprs, [{linewidth, 10000}]),
Log#{args => [unicode:characters_to_binary(String)]};
normalize_audit_log_args(Log = #{args := Args}) ->
Log#{args => [unicode:characters_to_binary(A) || A <- Args]}.
eval_erl([Parsed | _] = Expr) when is_tuple(Parsed) ->
eval_expr(Expr);
eval_erl([String]) ->