Encryption toggle added

This commit is contained in:
emad-salah 2021-04-23 17:33:43 +00:00
parent 4519ebabf8
commit ddbef24281
3 changed files with 14 additions and 9 deletions

View file

@ -5,7 +5,7 @@ PEERS=["http://gun.shock.network:8765/gun"]
# API Device Token # API Device Token
MS_TO_TOKEN_EXPIRATION=4500000 MS_TO_TOKEN_EXPIRATION=4500000
# E2EE # E2EE
DISABLE_SHOCK_ENCRYPTION=false SHOCK_ENCRYPTION_ECC=true
CACHE_HEADERS_MANDATORY=true CACHE_HEADERS_MANDATORY=true
SHOCK_CACHE=true SHOCK_CACHE=true
# Use only if disabling LND encrypt phrase (security risk) # Use only if disabling LND encrypt phrase (security risk)

View file

@ -85,7 +85,7 @@ const server = program => {
forked.send(params) forked.send(params)
}) })
if (process.env.DISABLE_SHOCK_ENCRYPTION === 'true') { if (process.env.SHOCK_ENCRYPTION_ECC === 'false') {
logger.error('Encryption Mode: false') logger.error('Encryption Mode: false')
} else { } else {
logger.info('Encryption Mode: true') logger.info('Encryption Mode: true')
@ -155,7 +155,10 @@ const server = program => {
const deviceId = req.headers['encryption-device-id'] const deviceId = req.headers['encryption-device-id']
const oldSend = res.send const oldSend = res.send
if (nonEncryptedRoutes.includes(req.path)) { if (
nonEncryptedRoutes.includes(req.path) ||
process.env.SHOCK_ENCRYPTION_ECC === 'false'
) {
next() next()
return return
} }
@ -206,7 +209,7 @@ const server = program => {
// Using classic promises syntax to avoid // Using classic promises syntax to avoid
// modifying res.send's return type // modifying res.send's return type
if (authorized) { if (authorized && process.env.SHOCK_ENCRYPTION_ECC !== 'false') {
ECC.encryptMessage({ ECC.encryptMessage({
deviceId, deviceId,
message: args[0] message: args[0]
@ -216,7 +219,7 @@ const server = program => {
}) })
} }
if (!authorized) { if (!authorized || process.env.SHOCK_ENCRYPTION_ECC === 'false') {
args[0] = JSON.stringify(args[0]) args[0] = JSON.stringify(args[0])
oldSend.apply(res, args) oldSend.apply(res, args)
} }
@ -351,7 +354,7 @@ const server = program => {
return randomField return randomField
} }
const newValue = await Encryption.generateRandomString() const newValue = await Encryption.generateRandomString(length)
await Storage.setItem(fieldName, newValue) await Storage.setItem(fieldName, newValue)
return newValue return newValue
} }
@ -462,7 +465,7 @@ const server = program => {
// app.use(bodyParser.json({limit: '100000mb'})); // app.use(bodyParser.json({limit: '100000mb'}));
app.use(bodyParser.json({ limit: '50mb' })) app.use(bodyParser.json({ limit: '50mb' }))
app.use(bodyParser.urlencoded({ limit: '50mb', extended: true })) app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }))
if (process.env.DISABLE_SHOCK_ENCRYPTION !== 'true') { if (process.env.SHOCK_ENCRYPTION_ECC !== 'false') {
app.use(modifyResponseBody) app.use(modifyResponseBody)
} }

View file

@ -26,7 +26,9 @@ const nonEncryptedEvents = [
/** /**
* @param {string} eventName * @param {string} eventName
*/ */
const isNonEncrypted = eventName => nonEncryptedEvents.includes(eventName) const isNonEncrypted = eventName =>
nonEncryptedEvents.includes(eventName) ||
process.env.SHOCK_ENCRYPTION_ECC === 'false'
/** /**
* @param {SimpleSocket} socket * @param {SimpleSocket} socket