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

Merge pull request #12759 from SergeTupchiy/EMQX-11808-remove-uploaded-invalid-backups 

fix(emqx_mgmt_data_backup): remove invalid uploaded backup files
This commit is contained in:
SergeTupchiy 2024-03-21 18:58:48 +02:00 committed by GitHub
parent 7d7c6685d4 40eccb10d6
commit e2a2295c99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_management/src/emqx_mgmt_data_backup.erl
View File

@ -315,8 +315,10 @@ do_upload(BackupFileNameStr, BackupFileContent) ->
catch
error:{badmatch, {error, Reason}}:Stack ->
?SLOG(error, #{msg => "emqx_data_upload_failed", reason => Reason, stacktrace => Stack}),
_ = file:delete(FilePath),
{error, Reason};
Class:Reason:Stack ->
_ = file:delete(FilePath),
?SLOG(error, #{
msg => "emqx_data_upload_failed",
exception => Class,

6
apps/emqx_management/test/emqx_mgmt_api_data_backup_SUITE.erl
View File

@ -199,7 +199,11 @@ upload_backup_test(Config, BackupName) ->
?assertEqual(ok, upload_backup(?NODE3_PORT, Auth, UploadFile)),
%% This file was specially forged to pass upload validation bat fail on import
?assertEqual(ok, upload_backup(?NODE2_PORT, Auth, BadImportFile)),
?assertEqual({error, bad_request}, upload_backup(?NODE1_PORT, Auth, BadUploadFile)).
?assertEqual({error, bad_request}, upload_backup(?NODE1_PORT, Auth, BadUploadFile)),
%% Invalid file must not be kept
?assertMatch(
{error, {_, 404, _}}, backup_file_op(get, ?NODE1_PORT, Auth, ?BAD_UPLOAD_BACKUP, [])
).
import_backup_test(Config, BackupName) ->
Auth = ?config(auth, Config),

1
changes/ce/fix-12759.en.md Normal file
View File

@ -0,0 +1 @@
Do not save invalid uploaded backup files.