Trusted keys bug fixes
This commit is contained in:
parent
de08e08d98
commit
34e18820de
1 changed files with 14 additions and 5 deletions
|
|
@ -522,17 +522,22 @@ module.exports = async (
|
||||||
trustedKey => trustedKey === publicKey
|
trustedKey => trustedKey === publicKey
|
||||||
)
|
)
|
||||||
const walletUnlocked = health.LNDStatus.walletStatus === 'unlocked'
|
const walletUnlocked = health.LNDStatus.walletStatus === 'unlocked'
|
||||||
|
const { authorization = '' } = req.headers
|
||||||
|
|
||||||
if (!walletUnlocked) {
|
if (!walletUnlocked) {
|
||||||
const unlockedWallet = await unlockWallet(password)
|
await unlockWallet(password)
|
||||||
|
|
||||||
if (!isKeyTrusted && unlockedWallet.field !== 'walletUnlocker') {
|
|
||||||
await Storage.set('trustedPKs', [...trustedKeys, publicKey])
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (walletUnlocked && !authorization && !isKeyTrusted) {
|
||||||
|
res.status(401).json({
|
||||||
|
field: 'alias',
|
||||||
|
errorMessage: 'Invalid alias/password combination',
|
||||||
|
success: false
|
||||||
|
})
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if (walletUnlocked && !isKeyTrusted) {
|
if (walletUnlocked && !isKeyTrusted) {
|
||||||
const { authorization = '' } = req.headers
|
|
||||||
const validatedToken = await validateToken(
|
const validatedToken = await validateToken(
|
||||||
authorization.replace('Bearer ', '')
|
authorization.replace('Bearer ', '')
|
||||||
)
|
)
|
||||||
|
|
@ -547,6 +552,10 @@ module.exports = async (
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!isKeyTrusted) {
|
||||||
|
await Storage.set('trustedPKs', [...(trustedKeys || []), publicKey])
|
||||||
|
}
|
||||||
|
|
||||||
// Send an event to update lightning's status
|
// Send an event to update lightning's status
|
||||||
mySocketsEvents.emit('updateLightning')
|
mySocketsEvents.emit('updateLightning')
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue