diff options
| author | Paweł Chmielowski <pchmielowski@process-one.net> | 2019-04-03 11:50:15 +0200 |
|---|---|---|
| committer | Paweł Chmielowski <pchmielowski@process-one.net> | 2019-04-03 11:50:15 +0200 |
| commit | 65a6532cd989315786d68bc9c6989606a038c70b (patch) | |
| tree | 271fa3007bb0bcf922cfd13cb80c219e8e0d5074 /src/mod_http_api.erl | |
| parent | Formating fix (diff) | |
Log message when trying to execute http_api command with extra arguments
Diffstat (limited to 'src/mod_http_api.erl')
| -rw-r--r-- | src/mod_http_api.erl | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/mod_http_api.erl b/src/mod_http_api.erl index ef492ed4f..39a98a967 100644 --- a/src/mod_http_api.erl +++ b/src/mod_http_api.erl @@ -307,7 +307,7 @@ handle(Call, Auth, Args, Version) when is_atom(Call), is_list(Args) -> {400, iolist_to_binary(Msg)}; ?EX_RULE(Class, Error, Stack) -> ?ERROR_MSG("REST API Error: " - "~s(~p) -> ~p:~p ~p", + "~s(~p) -> ~p:~p ~p", [Call, hide_sensitive_args(Args), Class, Error, ?EX_STACK(Stack)]), {500, <<"internal_error">>} @@ -322,7 +322,7 @@ handle(Call, Auth, Args, Version) when is_atom(Call), is_list(Args) -> handle2(Call, Auth, Args, Version) when is_atom(Call), is_list(Args) -> {ArgsF, _ResultF} = ejabberd_commands:get_command_format(Call, Auth, Version), - ArgsFormatted = format_args(Args, ArgsF), + ArgsFormatted = format_args(Call, Args, ArgsF), case ejabberd_commands:execute_command2(Call, ArgsFormatted, Auth, Version) of {error, Error} -> throw(Error); @@ -346,7 +346,7 @@ get_elem_delete(A, L, F) -> end end. -format_args(Args, ArgsFormat) -> +format_args(Call, Args, ArgsFormat) -> {ArgsRemaining, R} = lists:foldl(fun ({ArgName, ArgFormat}, {Args1, Res}) -> @@ -361,9 +361,11 @@ format_args(Args, ArgsFormat) -> case ArgsRemaining of [] -> R; L when is_list(L) -> + ExtraArgs = [N || {N, _} <- L], + ?INFO_MSG("Command ~s call rejected, it has unknown arguments ~w", + [Call, ExtraArgs]), throw({invalid_parameter, - io_lib:format("Request have unknown arguments: ~w", - [[N || {N, _} <- L]])}) + io_lib:format("Request have unknown arguments: ~w", [ExtraArgs])}) end. format_arg({Elements}, |