jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-23 11:16:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(store): Lowercase extensions before comparing

Browse Source
This commit is contained in:
Alexis Svinartchouk 2018-08-02 14:56:16 +02:00
parent b270d819a8
commit 7d2ba45620
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/gui/app/models/store.js
View File

@ -369,34 +369,39 @@ const storeReducer = (state = DEFAULT_STATE, action) => {
}) })
} }
if (_.some([ if (!_.isString(action.data.extension)) {
!_.isString(action.data.extension),
!_.includes(supportedFormats.getAllExtensions(), action.data.extension)
])) {
throw errors.createError({ throw errors.createError({
title: `Invalid image extension: ${action.data.extension}` title: `Invalid image extension: ${action.data.extension}`
}) })
} }
const lastImageExtension = fileExtensions.getLastFileExtension(action.data.path) const extension = _.toLower(action.data.extension)
if (lastImageExtension !== action.data.extension) { if (!_.includes(supportedFormats.getAllExtensions(), extension)) {
if (!action.data.archiveExtension) { throw errors.createError({
title: `Invalid image extension: ${action.data.extension}`
})
}
let lastImageExtension = fileExtensions.getLastFileExtension(action.data.path)
lastImageExtension = _.isString(lastImageExtension) ? _.toLower(lastImageExtension) : lastImageExtension
if (lastImageExtension !== extension) {
if (!_.isString(action.data.archiveExtension)) {
throw errors.createError({ throw errors.createError({
title: 'Missing image archive extension' title: 'Missing image archive extension'
}) })
} }
if (_.some([ const archiveExtension = _.toLower(action.data.archiveExtension)
!_.isString(action.data.archiveExtension),
!_.includes(supportedFormats.getAllExtensions(), action.data.archiveExtension) if (!_.includes(supportedFormats.getAllExtensions(), archiveExtension)) {
])) {
throw errors.createError({ throw errors.createError({
title: `Invalid image archive extension: ${action.data.archiveExtension}` title: `Invalid image archive extension: ${action.data.archiveExtension}`
}) })
} }
if (lastImageExtension !== action.data.archiveExtension) { if (lastImageExtension !== archiveExtension) {
throw errors.createError({ throw errors.createError({
title: `Image archive extension mismatch: ${action.data.archiveExtension} and ${lastImageExtension}` title: `Image archive extension mismatch: ${action.data.archiveExtension} and ${lastImageExtension}`
}) })