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

Variables up top

Browse source
This commit is contained in:
Daniel Lugo 2021-12-26 15:52:03 -04:00
parent 63a1b29d2d
commit 92899e24ab
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/routes.js
View file

@ -513,6 +513,15 @@ module.exports = async (
const walletInitialized = await walletExists() const walletInitialized = await walletExists()
const { alias, password, invite, accessSecret } = req.body const { alias, password, invite, accessSecret } = req.body
const lndUp = health.LNDStatus.success const lndUp = health.LNDStatus.success
const trustedKeysEnabled =
process.env.TRUSTED_KEYS === 'true' || !process.env.TRUSTED_KEYS
const walletUnlocked = health.LNDStatus.walletStatus === 'unlocked'
const { authorization = '' } = req.headers
const allowUnlockedLND = process.env.ALLOW_UNLOCKED_LND === 'true'
const trustedKeys = await Storage.get('trustedPKs')
const { lightning } = LightningServices.services
const { getUser } = require('../services/gunDB/Mediator')
const SEA = require('../services/gunDB/Mediator').mySEA
if (!lndUp) { if (!lndUp) {
throw new Error(health.LNDStatus.message) throw new Error(health.LNDStatus.message)
@ -539,15 +548,9 @@ module.exports = async (
return false return false
} }
const trustedKeysEnabled =
process.env.TRUSTED_KEYS === 'true' || !process.env.TRUSTED_KEYS
const trustedKeys = await Storage.get('trustedPKs')
// Falls back to true if trusted keys is disabled in .env
const [isKeyTrusted = !trustedKeysEnabled] = (trustedKeys || []).filter( const [isKeyTrusted = !trustedKeysEnabled] = (trustedKeys || []).filter(
trustedKey => trustedKey === publicKey trustedKey => trustedKey === publicKey
) )
const walletUnlocked = health.LNDStatus.walletStatus === 'unlocked'
const { authorization = '' } = req.headers
if (!isKeyTrusted) { if (!isKeyTrusted) {
logger.warn('Untrusted public key!') logger.warn('Untrusted public key!')
@ -566,7 +569,7 @@ module.exports = async (
walletUnlocked && walletUnlocked &&
!authorization && !authorization &&
!isKeyTrusted && !isKeyTrusted &&
(process.env.ALLOW_UNLOCKED_LND !== 'true' || secretUsed !== false) (!allowUnlockedLND || secretUsed !== false)
) { ) {
res.status(401).json({ res.status(401).json({
field: 'alias', field: 'alias',
@ -580,7 +583,7 @@ module.exports = async (
if ( if (
walletUnlocked && walletUnlocked &&
!isKeyTrusted && !isKeyTrusted &&
(process.env.ALLOW_UNLOCKED_LND !== 'true' || secretUsed !== false) (!allowUnlockedLND || secretUsed !== false)
) { ) {
const validatedToken = await validateToken( const validatedToken = await validateToken(
authorization.replace('Bearer ', '') authorization.replace('Bearer ', '')
@ -605,8 +608,6 @@ module.exports = async (
await Storage.set('trustedPKs', [...(trustedKeys || []), publicKey]) await Storage.set('trustedPKs', [...(trustedKeys || []), publicKey])
} }
const { lightning } = LightningServices.services
// Generate auth token and send it as a JSON response // Generate auth token and send it as a JSON response
const token = await auth.generateToken() const token = await auth.generateToken()
@ -635,8 +636,6 @@ module.exports = async (
}) })
//get the latest channel backups before subscribing //get the latest channel backups before subscribing
const user = require('../services/gunDB/Mediator').getUser()
const SEA = require('../services/gunDB/Mediator').mySEA
await Common.Utils.makePromise((res, rej) => { await Common.Utils.makePromise((res, rej) => {
lightning.exportAllChannelBackups({}, (err, channelBackups) => { lightning.exportAllChannelBackups({}, (err, channelBackups) => {
@ -647,7 +646,7 @@ module.exports = async (
res( res(
GunActions.saveChannelsBackup( GunActions.saveChannelsBackup(
JSON.stringify(channelBackups), JSON.stringify(channelBackups),
user, getUser(),
SEA SEA
) )
) )