IntenseWebs/PeerTube
3
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2024-11-22 00:38:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Server: catch JSON.parse exceptions

Browse Source
This commit is contained in:
Chocobozzz 2016-08-23 14:37:36 +02:00
parent 5267260022
commit 39f87cb216
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/lib/friends.js
View File

@ -198,7 +198,12 @@ function getForeignPodsList (url, callback) {
request.get(url + path, function (err, response, body) {
if (err) return callback(err)
callback(null, JSON.parse(body))
try {
const json = JSON.parse(body)
return callback(null, json)
} catch (err) {
return callback(err)
}
})
}

9
server/middlewares/secure.js
View File

@ -34,8 +34,13 @@ function decryptBody (req, res, next) {
return res.sendStatus(500)
}
req.body.data = JSON.parse(decrypted)
delete req.body.key
try {
req.body.data = JSON.parse(decrypted)
delete req.body.key
} catch (err) {
logger.error('Error in JSON.parse', { error: err })
return res.sendStatus(500)
}
next()
})