pulsar-edit/pulsar
1
1
Fork 0
mirror of https://github.com/pulsar-edit/pulsar.git synced 2024-09-20 15:37:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add explicit handle for errors when decrypting

Browse Source
This commit is contained in:
Rafael Oleza 2019-04-04 12:27:33 +02:00
parent bca056d956
commit 31d7dd6bb9
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main-process/atom-application.js
View File

@ -73,7 +73,7 @@ const getExistingSocketSecret = (atomVersion) => {
const createSocketSecret = (atomVersion) => {
const socketSecret = crypto.randomBytes(16).toString('hex')
fs.writeFileSync(getSocketSecretPath(atomVersion), socketSecret, 'utf8')
fs.writeFileSync(getSocketSecretPath(atomVersion), socketSecret, {encoding: 'utf8', mode: 0o600})
return socketSecret
}
@ -81,7 +81,7 @@ const createSocketSecret = (atomVersion) => {
const encryptOptions = (options, secret) => {
const message = JSON.stringify(options)
const initVector = crypto.randomBytes(16).toString('hex')
const initVector = crypto.randomBytes(16)
const cipher = crypto.createCipheriv('aes-256-gcm', secret, initVector)
@ -93,14 +93,14 @@ const encryptOptions = (options, secret) => {
return JSON.stringify({
authTag,
content,
initVector
initVector: initVector.toString('hex')
})
}
const decryptOptions = (optionsMessage, secret) => {
const {authTag, content, initVector} = JSON.parse(optionsMessage)
const decipher = crypto.createDecipheriv('aes-256-gcm', secret, initVector)
const decipher = crypto.createDecipheriv('aes-256-gcm', secret, Buffer.from(initVector, 'hex'))
decipher.setAuthTag(Buffer.from(authTag, 'hex'))
let message = decipher.update(content, 'hex', 'utf8')
@ -403,7 +403,13 @@ class AtomApplication extends EventEmitter {
let data = ''
connection.on('data', chunk => { data += chunk })
connection.on('end', () => {
this.openWithOptions(decryptOptions(data, this.socketSecret))
try {
const options = decryptOptions(data, this.socketSecret)
this.openWithOptions(options)
} catch (e) {
// Error while parsing/decrypting the options passed by the client.
// We cannot trust the client, aborting.
}
})
})