Merge pull request #7629 from DDDHuang/backup_file_43

fix: backup data filename, uri decode
This commit is contained in:
JianBo He 2022-04-16 10:36:43 +08:00 committed by GitHub
commit ffdf7fb7b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions

View File

@ -45,6 +45,7 @@ File format:
* Silence grep/sed warnings in docker-entrypoint.sh. [#7520] * Silence grep/sed warnings in docker-entrypoint.sh. [#7520]
* Generate `loaded_modules` and `loaded_plugins` files with default values when no such files exists. [#7520] * Generate `loaded_modules` and `loaded_plugins` files with default values when no such files exists. [#7520]
* Fix the configuration `server_name_indication` set to disable does not take effect. * Fix the configuration `server_name_indication` set to disable does not take effect.
* Fix backup files are not deleted and downloaded correctly when the API path has ISO8859-1 escape characters.
## v4.3.13 ## v4.3.13

View File

@ -1,6 +1,6 @@
{application, emqx_management, {application, emqx_management,
[{description, "EMQ X Management API and CLI"}, [{description, "EMQ X Management API and CLI"},
{vsn, "4.3.11"}, % strict semver, bump manually! {vsn, "4.3.12"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_management_sup]}, {registered, [emqx_management_sup]},
{applications, [kernel,stdlib,minirest]}, {applications, [kernel,stdlib,minirest]},

View File

@ -1,13 +1,13 @@
%% -*- mode: erlang -*- %% -*- mode: erlang -*-
{VSN, {VSN,
[ {<<"4\\.3\\.([0-9]|1[0])">>, [ {<<"4\\.3\\.([0-9]|1[0-1])">>,
[ {apply,{minirest,stop_http,['http:management']}}, [ {apply,{minirest,stop_http,['http:management']}},
{apply,{minirest,stop_http,['https:management']}}, {apply,{minirest,stop_http,['https:management']}},
{restart_application, emqx_management} {restart_application, emqx_management}
]}, ]},
{<<".*">>, []} {<<".*">>, []}
], ],
[ {<<"4\\.3\\.([0-9]|1[0])">>, [ {<<"4\\.3\\.([0-9]|1[0-1])">>,
[ {apply,{minirest,stop_http,['http:management']}}, [ {apply,{minirest,stop_http,['http:management']}},
{apply,{minirest,stop_http,['https:management']}}, {apply,{minirest,stop_http,['https:management']}},
{restart_application, emqx_management} {restart_application, emqx_management}

View File

@ -177,7 +177,8 @@ dump_to_tmp_file(Content) ->
ok = file:write_file(fullname(Filename), Bin), ok = file:write_file(fullname(Filename), Bin),
Filename. Filename.
fullname(Name) -> fullname(Name0) ->
Name = uri_string:percent_decode(Name0),
filename:join(emqx:get_env(data_dir), Name). filename:join(emqx:get_env(data_dir), Name).
tmp_filename() -> tmp_filename() ->