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

Merge pull request #12052 from SergeTupchiy/EMQX-11488-empty-data-file 

EMQX-11488 empty data file validation
This commit is contained in:
SergeTupchiy 2023-11-29 14:20:46 +02:00 committed by GitHub
parent 8ec3857f4d 009a15c7d0
commit 5f2b4daac8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/emqx_management/src/emqx_mgmt_api_data_backup.erl
View File

@ -204,7 +204,7 @@ data_export(post, _Request) ->
data_import(post, #{body := #{<<"filename">> := FileName} = Body}) -> data_import(post, #{body := #{<<"filename">> := FileName} = Body}) ->
case safe_parse_node(Body) of case safe_parse_node(Body) of
{error, Msg} -> {error, Msg} ->
{400, #{code => 'BAD_REQUEST', message => Msg}}; {400, #{code => ?BAD_REQUEST, message => Msg}};
FileNode -> FileNode ->
CoreNode = core_node(FileNode), CoreNode = core_node(FileNode),
response( response(
@ -231,8 +231,10 @@ data_files(post, #{body := #{<<"filename">> := #{type := _} = File}}) ->
ok -> ok ->
{204}; {204};
{error, Reason} -> {error, Reason} ->
{400, #{code => 'BAD_REQUEST', message => emqx_mgmt_data_backup:format_error(Reason)}} {400, #{code => ?BAD_REQUEST, message => emqx_mgmt_data_backup:format_error(Reason)}}
end; end;
data_files(post, #{body := _}) ->
{400, #{code => ?BAD_REQUEST, message => "Missing required parameter: filename"}};
data_files(get, #{query_string := PageParams}) -> data_files(get, #{query_string := PageParams}) ->
case emqx_mgmt_api:parse_pager_params(PageParams) of case emqx_mgmt_api:parse_pager_params(PageParams) of
false -> false ->
@ -244,7 +246,7 @@ data_files(get, #{query_string := PageParams}) ->
data_file_by_name(Method, #{bindings := #{filename := Filename}, query_string := QS}) -> data_file_by_name(Method, #{bindings := #{filename := Filename}, query_string := QS}) ->
case safe_parse_node(QS) of case safe_parse_node(QS) of
{error, Msg} -> {error, Msg} ->
{400, #{code => 'BAD_REQUEST', message => Msg}}; {400, #{code => ?BAD_REQUEST, message => Msg}};
Node -> Node ->
case get_or_delete_file(Method, Filename, Node) of case get_or_delete_file(Method, Filename, Node) of
{error, not_found} -> {error, not_found} ->