aiolabs/lightning-pub
2
0
Fork 0
Code Issues 9 Pull requests 4 Projects Releases Packages Wiki Activity Actions

Remove legacy encryption fallback code

Browse source
This commit is contained in:
emad-salah 2021-10-15 09:27:22 +01:00
parent 7b1e7ae97a
commit 281c7f7ac2
2 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/routes.js
View file

@ -218,8 +218,7 @@ module.exports = async (
try { try {
if ( if (
nonEncryptedRoutes.includes(req.path) || nonEncryptedRoutes.includes(req.path) ||
process.env.DISABLE_SHOCK_ENCRYPTION === 'true' || process.env.DISABLE_SHOCK_ENCRYPTION === 'true'
!deviceId
) { ) {
return next() return next()
} }

48
src/server.js
View file

@ -132,34 +132,32 @@ const server = program => {
return return
} }
if (deviceId) { res.send = (...args) => {
res.send = (...args) => { if (args[0] && args[0].ciphertext && args[0].iv) {
if (args[0] && args[0].ciphertext && args[0].iv) { logger.warn('Response loop detected!')
logger.warn('Response loop detected!') oldSend.apply(res, args)
oldSend.apply(res, args) return
return }
}
const authorized = ECC.isAuthorizedDevice({ const authorized = ECC.isAuthorizedDevice({
deviceId deviceId
})
// Using classic promises syntax to avoid
// modifying res.send's return type
if (authorized && process.env.SHOCK_ENCRYPTION_ECC !== 'false') {
ECC.encryptMessage({
deviceId,
message: args[0]
}).then(encryptedMessage => {
args[0] = JSON.stringify(encryptedMessage)
oldSend.apply(res, args)
}) })
}
// Using classic promises syntax to avoid if (!authorized || process.env.SHOCK_ENCRYPTION_ECC === 'false') {
// modifying res.send's return type args[0] = JSON.stringify(args[0])
if (authorized && process.env.SHOCK_ENCRYPTION_ECC !== 'false') { oldSend.apply(res, args)
ECC.encryptMessage({
deviceId,
message: args[0]
}).then(encryptedMessage => {
args[0] = JSON.stringify(encryptedMessage)
oldSend.apply(res, args)
})
}
if (!authorized || process.env.SHOCK_ENCRYPTION_ECC === 'false') {
args[0] = JSON.stringify(args[0])
oldSend.apply(res, args)
}
} }
} }