From 3ec60bf477cd80a19e6aa9e23040e1c1bc7d2381 Mon Sep 17 00:00:00 2001 From: eric-intuitem <71850047+eric-intuitem@users.noreply.github.com> Date: Wed, 4 Dec 2024 01:00:56 +0100 Subject: [PATCH 1/2] use private extension to avoid safari decompression --- backend/.meta | 4 ++-- backend/ciso_assistant/.meta | 4 ++-- .../src/routes/(app)/(internal)/backup-restore/+page.svelte | 2 +- .../routes/(app)/(internal)/backup-restore/dump-db/+server.ts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/.meta b/backend/.meta index 3c01d68cb..560890a5f 100644 --- a/backend/.meta +++ b/backend/.meta @@ -1,2 +1,2 @@ -CISO_ASSISTANT_VERSION=dev -CISO_ASSISTANT_BUILD=dev +CISO_ASSISTANT_VERSION=v1.9.18-38-g427ceedd +CISO_ASSISTANT_BUILD=427ceedd diff --git a/backend/ciso_assistant/.meta b/backend/ciso_assistant/.meta index 3c01d68cb..560890a5f 100644 --- a/backend/ciso_assistant/.meta +++ b/backend/ciso_assistant/.meta @@ -1,2 +1,2 @@ -CISO_ASSISTANT_VERSION=dev -CISO_ASSISTANT_BUILD=dev +CISO_ASSISTANT_VERSION=v1.9.18-38-g427ceedd +CISO_ASSISTANT_BUILD=427ceedd diff --git a/frontend/src/routes/(app)/(internal)/backup-restore/+page.svelte b/frontend/src/routes/(app)/(internal)/backup-restore/+page.svelte index d88138047..78d868755 100644 --- a/frontend/src/routes/(app)/(internal)/backup-restore/+page.svelte +++ b/frontend/src/routes/(app)/(internal)/backup-restore/+page.svelte @@ -22,7 +22,7 @@ $: uploadButtonStyles = file ? '' : 'chip-disabled'; - const authorizedExtensions = ['.json', '.gz']; + const authorizedExtensions = ['.bak']; const user = $page.data.user; const canBackup: boolean = Object.hasOwn(user.permissions, 'backup'); diff --git a/frontend/src/routes/(app)/(internal)/backup-restore/dump-db/+server.ts b/frontend/src/routes/(app)/(internal)/backup-restore/dump-db/+server.ts index 1e25b769e..a934a2e8a 100644 --- a/frontend/src/routes/(app)/(internal)/backup-restore/dump-db/+server.ts +++ b/frontend/src/routes/(app)/(internal)/backup-restore/dump-db/+server.ts @@ -10,7 +10,7 @@ export const GET: RequestHandler = async ({ fetch }) => { error(400, 'Error fetching the dump file'); } - const fileName = `ciso-assistant-db-${new Date().toISOString()}.json.gz`; + const fileName = `ciso-assistant-db-${new Date().toISOString()}.bak`; return new Response(await res.blob(), { headers: { From 937842b4fc505356be63385ab1602d854dc12ace Mon Sep 17 00:00:00 2001 From: Nassim Tabchiche Date: Wed, 4 Dec 2024 16:27:28 +0100 Subject: [PATCH 2/2] Remove .meta files --- backend/.meta | 2 -- backend/ciso_assistant/.meta | 2 -- 2 files changed, 4 deletions(-) delete mode 100644 backend/.meta delete mode 100644 backend/ciso_assistant/.meta diff --git a/backend/.meta b/backend/.meta deleted file mode 100644 index 560890a5f..000000000 --- a/backend/.meta +++ /dev/null @@ -1,2 +0,0 @@ -CISO_ASSISTANT_VERSION=v1.9.18-38-g427ceedd -CISO_ASSISTANT_BUILD=427ceedd diff --git a/backend/ciso_assistant/.meta b/backend/ciso_assistant/.meta deleted file mode 100644 index 560890a5f..000000000 --- a/backend/ciso_assistant/.meta +++ /dev/null @@ -1,2 +0,0 @@ -CISO_ASSISTANT_VERSION=v1.9.18-38-g427ceedd -CISO_ASSISTANT_BUILD=427ceedd