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

Merge pull request #144 from shocknet/bug/auth_tokens

Browse source 
Trusted keys bug fixes
This commit is contained in:
CapDog 2020-08-12 12:40:57 -04:00 • committed by GitHub
commit ef55fd251a
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/routes.js
View file

@ -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') { if (walletUnlocked && !authorization && !isKeyTrusted) {
await Storage.set('trustedPKs', [...trustedKeys, publicKey]) 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')
@ -854,6 +863,9 @@ module.exports = async (
// Register user after verifying wallet password // Register user after verifying wallet password
const publicKey = await GunDB.register(alias, password) const publicKey = await GunDB.register(alias, password)
const trustedKeys = await Storage.get('trustedPKs')
await Storage.setItem('trustedPKs', [...(trustedKeys || []), publicKey])
// Generate Access Token // Generate Access Token
const token = await auth.generateToken() const token = await auth.generateToken()