fix(ft): ensure temp filenames are under 255 bytes long
This commit is contained in:
parent
67db9d6fe9
commit
69b98c1830
|
@ -29,6 +29,8 @@
|
||||||
|
|
||||||
-export([fold/4]).
|
-export([fold/4]).
|
||||||
|
|
||||||
|
-export([mk_temp_filename/1]).
|
||||||
|
|
||||||
-type foldfun(Acc) ::
|
-type foldfun(Acc) ::
|
||||||
fun(
|
fun(
|
||||||
(
|
(
|
||||||
|
@ -178,3 +180,24 @@ fold(FoldFun, Acc, It) ->
|
||||||
none ->
|
none ->
|
||||||
Acc
|
Acc
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
-spec mk_temp_filename(file:filename()) ->
|
||||||
|
file:filename().
|
||||||
|
mk_temp_filename(Filename) ->
|
||||||
|
% NOTE
|
||||||
|
% Using only the first 200 characters of the filename to avoid making filenames
|
||||||
|
% exceeding 255 bytes in UTF-8. It's actually too conservative, `Suffix` can be
|
||||||
|
% at most 16 bytes.
|
||||||
|
Unique = erlang:unique_integer([positive]),
|
||||||
|
Suffix = binary:encode_hex(<<Unique:64>>),
|
||||||
|
mk_filename([string:slice(Filename, 0, 200), ".", Suffix]).
|
||||||
|
|
||||||
|
mk_filename(Comps) ->
|
||||||
|
lists:append(lists:map(fun mk_filename_component/1, Comps)).
|
||||||
|
|
||||||
|
mk_filename_component(A) when is_atom(A) ->
|
||||||
|
atom_to_list(A);
|
||||||
|
mk_filename_component(B) when is_binary(B) ->
|
||||||
|
unicode:characters_to_list(B);
|
||||||
|
mk_filename_component(S) when is_list(S) ->
|
||||||
|
S.
|
||||||
|
|
|
@ -145,7 +145,7 @@ fields(local_storage_segments) ->
|
||||||
[
|
[
|
||||||
{root,
|
{root,
|
||||||
mk(
|
mk(
|
||||||
binary(),
|
string(),
|
||||||
#{
|
#{
|
||||||
desc => ?DESC("local_storage_segments_root"),
|
desc => ?DESC("local_storage_segments_root"),
|
||||||
required => false
|
required => false
|
||||||
|
@ -182,7 +182,7 @@ fields(local_storage_exporter) ->
|
||||||
[
|
[
|
||||||
{root,
|
{root,
|
||||||
mk(
|
mk(
|
||||||
binary(),
|
string(),
|
||||||
#{
|
#{
|
||||||
desc => ?DESC("local_storage_exporter_root"),
|
desc => ?DESC("local_storage_exporter_root"),
|
||||||
required => false
|
required => false
|
||||||
|
|
|
@ -452,8 +452,7 @@ mk_manifest_filename(Filename) when is_binary(Filename) ->
|
||||||
<<Filename/binary, ?MANIFEST>>.
|
<<Filename/binary, ?MANIFEST>>.
|
||||||
|
|
||||||
mk_temp_absfilepath(Options, Transfer, Filename) ->
|
mk_temp_absfilepath(Options, Transfer, Filename) ->
|
||||||
Unique = erlang:unique_integer([positive]),
|
TempFilename = emqx_ft_fs_util:mk_temp_filename(Filename),
|
||||||
TempFilename = integer_to_list(Unique) ++ "." ++ Filename,
|
|
||||||
filename:join(mk_absdir(Options, Transfer, temporary), TempFilename).
|
filename:join(mk_absdir(Options, Transfer, temporary), TempFilename).
|
||||||
|
|
||||||
mk_absdir(Options, _Transfer, temporary) ->
|
mk_absdir(Options, _Transfer, temporary) ->
|
||||||
|
|
|
@ -445,16 +445,8 @@ write_file_atomic(Storage, Transfer, Filepath, Content) when is_binary(Content)
|
||||||
end.
|
end.
|
||||||
|
|
||||||
mk_temp_filepath(Storage, Transfer, Filename) ->
|
mk_temp_filepath(Storage, Transfer, Filename) ->
|
||||||
Unique = erlang:unique_integer([positive]),
|
TempFilename = emqx_ft_fs_util:mk_temp_filename(Filename),
|
||||||
filename:join(get_subdir(Storage, Transfer, temporary), mk_filename([Unique, ".", Filename])).
|
filename:join(get_subdir(Storage, Transfer, temporary), TempFilename).
|
||||||
|
|
||||||
mk_filename(Comps) ->
|
|
||||||
lists:append(lists:map(fun mk_filename_component/1, Comps)).
|
|
||||||
|
|
||||||
mk_filename_component(I) when is_integer(I) -> integer_to_list(I);
|
|
||||||
mk_filename_component(A) when is_atom(A) -> atom_to_list(A);
|
|
||||||
mk_filename_component(B) when is_binary(B) -> unicode:characters_to_list(B);
|
|
||||||
mk_filename_component(S) when is_list(S) -> S.
|
|
||||||
|
|
||||||
write_contents(Filepath, Content) ->
|
write_contents(Filepath, Content) ->
|
||||||
file:write_file(Filepath, Content).
|
file:write_file(Filepath, Content).
|
||||||
|
|
|
@ -270,7 +270,8 @@ t_nasty_filenames(_Config) ->
|
||||||
Filenames = [
|
Filenames = [
|
||||||
{<<"nasty1">>, "146%"},
|
{<<"nasty1">>, "146%"},
|
||||||
{<<"nasty2">>, "🌚"},
|
{<<"nasty2">>, "🌚"},
|
||||||
{<<"nasty3">>, "中文.txt"}
|
{<<"nasty3">>, "中文.txt"},
|
||||||
|
{<<"nasty4">>, _254Bytes = string:join(lists:duplicate(255 div 5, "LONG"), ".")}
|
||||||
],
|
],
|
||||||
ok = lists:foreach(
|
ok = lists:foreach(
|
||||||
fun({ClientId, Filename}) ->
|
fun({ClientId, Filename}) ->
|
||||||
|
|
|
@ -87,7 +87,7 @@ t_update_config(_Config) ->
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
?assertEqual(
|
?assertEqual(
|
||||||
<<"/tmp/path">>,
|
"/tmp/path",
|
||||||
emqx_config:get([file_transfer, storage, local, segments, root])
|
emqx_config:get([file_transfer, storage, local, segments, root])
|
||||||
),
|
),
|
||||||
?assertEqual(
|
?assertEqual(
|
||||||
|
@ -150,7 +150,7 @@ t_disable_restore_config(Config) ->
|
||||||
),
|
),
|
||||||
ok = emqtt:stop(Client),
|
ok = emqtt:stop(Client),
|
||||||
% Restore local storage backend
|
% Restore local storage backend
|
||||||
Root = iolist_to_binary(emqx_ft_test_helpers:root(Config, node(), [segments])),
|
Root = emqx_ft_test_helpers:root(Config, node(), [segments]),
|
||||||
?assertMatch(
|
?assertMatch(
|
||||||
{ok, _},
|
{ok, _},
|
||||||
emqx_conf:update(
|
emqx_conf:update(
|
||||||
|
@ -177,7 +177,7 @@ t_disable_restore_config(Config) ->
|
||||||
[
|
[
|
||||||
#{
|
#{
|
||||||
?snk_kind := garbage_collection,
|
?snk_kind := garbage_collection,
|
||||||
storage := #{segments := #{root := Root}}
|
storage := #{segments := #{gc := #{interval := 1000}}}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
?of_kind(garbage_collection, Trace)
|
?of_kind(garbage_collection, Trace)
|
||||||
|
|
|
@ -63,3 +63,24 @@ unescape_filename_test_() ->
|
||||||
?_assertEqual(Input, emqx_ft_fs_util:unescape_filename(Filename))
|
?_assertEqual(Input, emqx_ft_fs_util:unescape_filename(Filename))
|
||||||
|| {Filename, Input} <- ?NAMES
|
|| {Filename, Input} <- ?NAMES
|
||||||
].
|
].
|
||||||
|
|
||||||
|
mk_temp_filename_test_() ->
|
||||||
|
[
|
||||||
|
?_assertMatch(
|
||||||
|
"." ++ Suffix when length(Suffix) == 16,
|
||||||
|
emqx_ft_fs_util:mk_temp_filename(<<>>)
|
||||||
|
),
|
||||||
|
?_assertMatch(
|
||||||
|
"file.name." ++ Suffix when length(Suffix) == 16,
|
||||||
|
emqx_ft_fs_util:mk_temp_filename("file.name")
|
||||||
|
),
|
||||||
|
?_assertMatch(
|
||||||
|
"safe.🦺." ++ Suffix when length(Suffix) == 16,
|
||||||
|
emqx_ft_fs_util:mk_temp_filename(<<"safe.🦺"/utf8>>)
|
||||||
|
),
|
||||||
|
?_assertEqual(
|
||||||
|
% FilenameSlice + Dot + Suffix
|
||||||
|
200 + 1 + 16,
|
||||||
|
length(emqx_ft_fs_util:mk_temp_filename(lists:duplicate(63, "LONG")))
|
||||||
|
)
|
||||||
|
].
|
||||||
|
|
Loading…
Reference in New Issue