Skip to content
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.

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

Fix TypeError when invalid initialization vector #3416

Merged
merged 1 commit into from
Feb 1, 2022
Merged
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion packages/@uppy/companion/src/server/helpers/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,18 @@ module.exports.decrypt = (encrypted, secret) => {

const iv = Buffer.from(encrypted.slice(0, 32), 'hex')
const encryptionWithoutIv = encrypted.slice(32)
const decipher = crypto.createDecipheriv('aes256', createSecret(secret), iv)

let decipher
try {
decipher = crypto.createDecipheriv('aes256', createSecret(secret), iv)
} catch (err) {
if (err.code === 'ERR_CRYPTO_INVALID_IV') {
throw new Error('Invalid initialization vector')
} else {
throw err
}
}

let decrypted = decipher.update(urlDecode(encryptionWithoutIv), 'base64', 'utf8')
decrypted += decipher.final('utf8')
return decrypted
Expand Down