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

Fixed encryption toggle always detected as "true"

Browse source
This commit is contained in:
emad-salah 2020-06-20 22:11:49 +01:00
parent aa9d471409
commit f315adf574
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/routes.js
View file

@ -229,7 +229,7 @@ module.exports = async (
const deviceId = req.headers["x-shockwallet-device-id"];
logger.debug("Decrypting route...")
try {
if (nonEncryptedRoutes.includes(req.path) || process.env.DISABLE_SHOCK_ENCRYPTION) {
if (nonEncryptedRoutes.includes(req.path) || process.env.DISABLE_SHOCK_ENCRYPTION === "true") {
return next();
}

11
src/server.js
View file

@ -43,7 +43,7 @@ const server = program => {
logger.info('Mainnet Mode:', !!program.mainnet)
if (process.env.DISABLE_SHOCK_ENCRYPTION) {
if (process.env.DISABLE_SHOCK_ENCRYPTION === 'true') {
logger.error('Encryption Mode: false')
} else {
logger.info('Encryption Mode: true')
@ -72,10 +72,7 @@ const server = program => {
const deviceId = req.headers['x-shockwallet-device-id']
const oldSend = res.send
if (
!nonEncryptedRoutes.includes(req.path) &&
!process.env.DISABLE_SHOCK_ENCRYPTION
) {
if (!nonEncryptedRoutes.includes(req.path)) {
res.send = (...args) => {
if (args[0] && args[0].encryptedData && args[0].encryptionKey) {
logger.warn('Response loop detected!')
@ -260,7 +257,9 @@ const server = program => {
// app.use(bodyParser.json({limit: '100000mb'}));
app.use(bodyParser.json({ limit: '50mb' }))
app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }))
app.use(modifyResponseBody)
if (process.env.DISABLE_SHOCK_ENCRYPTION !== 'true') {
app.use(modifyResponseBody)
}
serverInstance.listen(module.serverPort, module.serverhost)