Skip to content

fix: Stronghold import failed with larger files #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 17, 2021
Merged

fix: Stronghold import failed with larger files #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions packages/shared/components/inputs/Dropzone.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,38 @@
import { Text, Button } from 'shared/components'

export let locale = undefined
export let onDrop = () => {}
export let onDrop = (buffer?, name?, path?) => {}
export let extentionsLabel = ''
export let allowedExtensions = '*'
export let allowedExtensions

let dropping = false
let fileName = null

// TODO: allow drop only allowedExtensions
const onFile = (e) => {
e.preventDefault()
dropping = false

const file = e.dataTransfer ? e.dataTransfer.files[0] : e.target.files[0]
fileName = file.name

// TODO: should we limit by size?
if (!file || file.size > 100000) {
if (!file) {
fileName = null
return onDrop(false)
return onDrop()
}

const filePath = file.path
if (allowedExtensions && allowedExtensions.length > 0) {
const ext = /\.([0-9a-z]+)$/i.exec(file.name)
if (!ext || !allowedExtensions.includes(ext[1])) {
fileName = null
return onDrop()
}
}

fileName = file.name

const reader = new FileReader()
reader.fileName = fileName
reader.filePath = filePath

reader.onload = (e) => {
const buffer = e.target.result
const name = e.target.fileName
onDrop(buffer, name, filePath)
onDrop(e.target.result, file.name, file.path)
}

reader.readAsArrayBuffer(file)
Expand Down Expand Up @@ -88,7 +89,11 @@
17.6445L25 32C25 33.1045 25.8954 34 27 34L38 34C44.6274 34 50 28.6274 50 22C50 15.658 45.0802 10.4651 38.8489
10.0296C36.4827 4.15025 30.726 0 24 0C15.1634 0 8 7.16344 8 16L8.00009 16.0549C3.5001 16.5523 0 20.3674 0 25Z" />
</svg>
<input class="absolute opacity-0 w-full h-full" type="file" on:change={onFile} accept={allowedExtensions} />
<input
class="absolute opacity-0 w-full h-full"
type="file"
on:change={onFile}
accept={allowedExtensions ? allowedExtensions.map((e) => `.${e}`).join(',') : '*'} />
<Text type="h4">{locale('actions.dragDrop')}</Text>
<Text classes="mb-12" type="p" secondary smaller>{extentionsLabel}</Text>
<Button secondary onClick={onFile}>{locale('actions.chooseFile')}</Button>
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/routes/setup/import/views/FileImport.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
{onDrop}
{locale}
extentionsLabel={locale('actions.importExtentions')}
allowedExtensions=".kdbx,.stronghold" />
allowedExtensions={["kdbx", "stronghold"]} />
</div>
<div slot="leftpane__action" class="flex flex-row flex-wrap justify-between items-center space-x-4">
<Button secondary classes="flex-1" onClick={() => handleBackClick()}>{locale('actions.back')}</Button>
Expand Down