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

fix(ft): handle wider class of jiffy decode errors 

With malformed cursors in the File listing API.

Fixes EMQX-9965
This commit is contained in:
Andrew Mayorov 2023-05-23 20:00:00 +03:00
parent cb14a3e08b
commit 2dbf84479c
No known key found for this signature in database
GPG Key ID: 2837C62ACFBFED5D
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_ft/src/emqx_ft_storage_exporter_fs.erl
View File

@ -422,7 +422,7 @@ decode_cursor(Cursor) ->
true = is_list(Name), true = is_list(Name),
{Node, #{transfer => {ClientId, FileId}, name => Name}} {Node, #{transfer => {ClientId, FileId}, name => Name}}
catch catch
error:{_, invalid_json} -> error:{Loc, JsonError} when is_integer(Loc), is_atom(JsonError) ->
error({badarg, cursor}); error({badarg, cursor});
error:{badmatch, _} -> error:{badmatch, _} ->
error({badarg, cursor}); error({badarg, cursor});

10
apps/emqx_ft/test/emqx_ft_api_SUITE.erl
View File

@ -216,6 +216,16 @@ t_list_files_paging(Config) ->
request_json(get, uri(["file_transfer", "files"]) ++ query(#{limit => 0})) request_json(get, uri(["file_transfer", "files"]) ++ query(#{limit => 0}))
), ),
?assertMatch(
{ok, 400, #{<<"code">> := <<"BAD_REQUEST">>}},
request_json(get, uri(["file_transfer", "files"]) ++ query(#{following => <<>>}))
),
?assertMatch(
{ok, 400, #{<<"code">> := <<"BAD_REQUEST">>}},
request_json(get, uri(["file_transfer", "files"]) ++ query(#{following => <<"{\"\":}">>}))
),
?assertMatch( ?assertMatch(
{ok, 400, #{<<"code">> := <<"BAD_REQUEST">>}}, {ok, 400, #{<<"code">> := <<"BAD_REQUEST">>}},
request_json( request_json(