MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure password is always requested when working with encrypted files - if the enc file has been copied the name may change format, we should handle if this happens.

This commit is contained in:
mike12345567 2024-12-17 12:28:22 +00:00
parent c905d64f31
commit 2e7f75e93c
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/builder/src/components/start/CreateAppModal.svelte
View File

@ -26,6 +26,7 @@
const values = writable({ name: "", url: null }) const values = writable({ name: "", url: null })
const validation = createValidationStore() const validation = createValidationStore()
const encryptionValidation = createValidationStore() const encryptionValidation = createValidationStore()
const isEncryptedRegex = /^.*\.enc.*\.tar\.gz$/gm
$: { $: {
const { url } = $values const { url } = $values
@ -37,7 +38,9 @@
encryptionValidation.check({ ...$values }) encryptionValidation.check({ ...$values })
} }
$: encryptedFile = $values.file?.name?.endsWith(".enc.tar.gz") // filename should be separated to avoid updates everytime any other form element changes
$: filename = $values.file?.name
$: encryptedFile = isEncryptedRegex.test(filename)
onMount(async () => { onMount(async () => {
const lastChar = $auth.user?.firstName const lastChar = $auth.user?.firstName
@ -171,7 +174,7 @@
try { try {
await createNewApp() await createNewApp()
} catch (error) { } catch (error) {
notifications.error("Error creating app") notifications.error(`Error creating app - ${error.message}`)
} }
} }
}, },

2
packages/builder/src/pages/builder/portal/apps/index.svelte
View File

@ -139,7 +139,7 @@
await auth.setInitInfo({}) await auth.setInitInfo({})
$goto(`/builder/app/${createdApp.instance._id}`) $goto(`/builder/app/${createdApp.instance._id}`)
} catch (error) { } catch (error) {
notifications.error("Error creating app") notifications.error(`Error creating app - ${error.message}`)
} }
} }

4
packages/server/src/sdk/app/backups/imports.ts
View File

@ -187,6 +187,10 @@ export async function importApp(
await decryptFiles(tmpPath, template.file.password) await decryptFiles(tmpPath, template.file.password)
} }
const contents = await fsp.readdir(tmpPath) const contents = await fsp.readdir(tmpPath)
const stillEncrypted = !!contents.find(name => name.endsWith(".enc"))
if (stillEncrypted) {
throw new Error("Files are encrypted but no password has been supplied.")
}
// have to handle object import // have to handle object import
if (contents.length && opts.importObjStoreContents) { if (contents.length && opts.importObjStoreContents) {
let promises = [] let promises = []