From 2f5170f70c5b8e6826d76c4fdebb0e6475fd8478 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 11 Oct 2022 19:28:13 +0100
Subject: [PATCH] Some fixes + cleanup of tmp directory.

---
 .../backend-core/src/objectStore/index.ts     |  1 +
 packages/server/src/api/controllers/backup.ts |  2 +-
 packages/server/src/sdk/app/export.ts         | 43 +++++++++++++------
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/packages/backend-core/src/objectStore/index.ts b/packages/backend-core/src/objectStore/index.ts
index 903ba28ed1..4c88166375 100644
--- a/packages/backend-core/src/objectStore/index.ts
+++ b/packages/backend-core/src/objectStore/index.ts
@@ -263,6 +263,7 @@ export const retrieveToTmp = async (bucketName: string, filepath: string) => {
 
 export const retrieveDirectory = async (bucketName: string, path: string) => {
   let writePath = join(budibaseTempDir(), v4())
+  fs.mkdirSync(writePath)
   const objects = await listAllObjects(bucketName, path)
   let fullObjects = await Promise.all(
     objects.map(obj => retrieve(bucketName, obj.Key!))
diff --git a/packages/server/src/api/controllers/backup.ts b/packages/server/src/api/controllers/backup.ts
index 878a81e110..7fe197de76 100644
--- a/packages/server/src/api/controllers/backup.ts
+++ b/packages/server/src/api/controllers/backup.ts
@@ -7,7 +7,7 @@ export async function exportAppDump(ctx: any) {
   let { appId, excludeRows } = ctx.query
   const appName = decodeURI(ctx.query.appname)
   excludeRows = isQsTrue(excludeRows)
-  const backupIdentifier = `${appName}-export-${new Date().getTime()}.txt`
+  const backupIdentifier = `${appName}-export-${new Date().getTime()}.tar.gz`
   ctx.attachment(backupIdentifier)
   ctx.body = await sdk.apps.exports.streamExportApp(appId, excludeRows)
 
diff --git a/packages/server/src/sdk/app/export.ts b/packages/server/src/sdk/app/export.ts
index ad71062483..68aa873129 100644
--- a/packages/server/src/sdk/app/export.ts
+++ b/packages/server/src/sdk/app/export.ts
@@ -23,19 +23,19 @@ type ExportOpts = {
   excludeRows?: boolean
 }
 
-function tarFiles(cwd: string, files: string[], exportName?: string) {
-  exportName = exportName ? `${exportName}.tar.gz` : "export.tar.gz"
+function tarFilesToTmp(tmpDir: string, files: string[]) {
+  const exportFile = join(budibaseTempDir(), `${uuid()}.tar.gz`)
   tar.create(
     {
       sync: true,
       gzip: true,
-      file: exportName,
+      file: exportFile,
       recursive: true,
-      cwd,
+      cwd: tmpDir,
     },
     files
   )
-  return join(cwd, exportName)
+  return exportFile
 }
 
 /**
@@ -52,7 +52,7 @@ export async function exportDB(dbName: string, opts: ExportOpts = {}) {
       const path = opts?.exportPath
       const writeStream = fs.createWriteStream(path)
       await db.dump(writeStream, { filter: opts?.filter })
-      return fs.createReadStream(path)
+      return path
     } else {
       // Stringify the dump in memory if required
       const memStream = new MemoryStream()
@@ -90,10 +90,16 @@ export async function exportApp(appId: string, config?: ExportOpts) {
     ObjectStoreBuckets.APPS,
     attachmentsPath
   )
-  // move out of app directory, simplify structure
-  fs.renameSync(join(tmpPath, attachmentsPath), join(tmpPath, ATTACHMENT_PATH))
-  // remove the old app directory created by object export
-  fs.rmdirSync(join(tmpPath, prodAppId))
+  const downloadedPath = join(tmpPath, attachmentsPath),
+    tmpAttachmentPath = join(tmpPath, ATTACHMENT_PATH)
+  if (fs.existsSync(downloadedPath)) {
+    // move out of app directory, simplify structure
+    fs.renameSync(downloadedPath, tmpAttachmentPath)
+    // remove the old app directory created by object export
+    fs.rmdirSync(join(tmpPath, prodAppId))
+  } else {
+    fs.mkdirSync(tmpAttachmentPath)
+  }
   // enforce an export of app DB to the tmp path
   const dbPath = join(tmpPath, DB_EXPORT_FILE)
   await exportDB(appId, {
@@ -104,7 +110,10 @@ export async function exportApp(appId: string, config?: ExportOpts) {
   // if tar requested, return where the tarball is
   if (config?.tar) {
     // now the tmpPath contains both the DB export and attachments, tar this
-    return tarFiles(tmpPath, [ATTACHMENT_PATH, DB_EXPORT_FILE])
+    const tarPath = tarFilesToTmp(tmpPath, [ATTACHMENT_PATH, DB_EXPORT_FILE])
+    // cleanup the tmp export files as tarball returned
+    fs.rmSync(tmpPath, { recursive: true, force: true })
+    return tarPath
   }
   // tar not requested, turn the directory where export is
   else {
@@ -112,6 +121,13 @@ export async function exportApp(appId: string, config?: ExportOpts) {
   }
 }
 
+/**
+ * Export all apps + global DB (if supplied) to a single tarball, this includes
+ * the attachments for each app as well.
+ * @param {string[]} appIds The IDs of the apps to be exported.
+ * @param {string} globalDbContents The contents of the global DB to export as well.
+ * @return {string} The path to the tarball.
+ */
 export async function exportMultipleApps(
   appIds: string[],
   globalDbContents?: string
@@ -129,7 +145,10 @@ export async function exportMultipleApps(
   if (globalDbContents) {
     fs.writeFileSync(join(tmpPath, GLOBAL_DB_EXPORT_FILE), globalDbContents)
   }
-  return tarFiles(tmpPath, [...appIds, GLOBAL_DB_EXPORT_FILE])
+  const tarPath = tarFilesToTmp(tmpPath, [...appIds, GLOBAL_DB_EXPORT_FILE])
+  // clear up the tmp path now tarball generated
+  fs.rmSync(tmpPath, { recursive: true, force: true })
+  return tarPath
 }
 
 /**