From 40eccb10d66a38ebb3e694dcae9c5a2d8b297813 Mon Sep 17 00:00:00 2001
From: Serge Tupchii <serge.tupchii@protonmail.com>
Date: Thu, 21 Mar 2024 17:30:45 +0200
Subject: [PATCH] fix(emqx_mgmt_data_backup): remove an uploaded backup file if
 it's not valid

---
 apps/emqx_management/src/emqx_mgmt_data_backup.erl          | 2 ++
 .../test/emqx_mgmt_api_data_backup_SUITE.erl                | 6 +++++-
 changes/ce/fix-12759.en.md                                  | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 changes/ce/fix-12759.en.md

diff --git a/apps/emqx_management/src/emqx_mgmt_data_backup.erl b/apps/emqx_management/src/emqx_mgmt_data_backup.erl
index d88a4d998..2aaa014a8 100644
--- a/apps/emqx_management/src/emqx_mgmt_data_backup.erl
+++ b/apps/emqx_management/src/emqx_mgmt_data_backup.erl
@@ -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,
diff --git a/apps/emqx_management/test/emqx_mgmt_api_data_backup_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_api_data_backup_SUITE.erl
index e94de971d..6a580fd57 100644
--- a/apps/emqx_management/test/emqx_mgmt_api_data_backup_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_api_data_backup_SUITE.erl
@@ -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),
diff --git a/changes/ce/fix-12759.en.md b/changes/ce/fix-12759.en.md
new file mode 100644
index 000000000..2906bd17e
--- /dev/null
+++ b/changes/ce/fix-12759.en.md
@@ -0,0 +1 @@
+Do not save invalid uploaded backup files.