highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-09-04 12:54:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

watchtower: prevent removal of last tower addr

Browse Source 
This addresses a potential panic when a tower has one of its candidate
sessions chosen, but its only reachable address was removed by a
user-initiated RPC before the fact.
This commit is contained in:
Wilmer Paulino
2020-11-03 10:27:57 -08:00
parent 3ae46d81f4
commit d3157bcaf8
5 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
watchtower/wtclient/candidate_iterator.go
View File

@@ -19,7 +19,7 @@ type TowerCandidateIterator interface {
// iterator. An optional address can be provided to indicate a stale
// tower address to remove it. If it isn't provided, then the tower is
// completely removed from the iterator.
RemoveCandidate(wtdb.TowerID, net.Addr)
RemoveCandidate(wtdb.TowerID, net.Addr) error
// IsActive determines whether a given tower is exists within the
// iterator.
@@ -131,19 +131,26 @@ func (t *towerListIterator) AddCandidate(candidate *wtdb.Tower) {
// optional address can be provided to indicate a stale tower address to remove
// it. If it isn't provided, then the tower is completely removed from the
// iterator.
func (t *towerListIterator) RemoveCandidate(candidate wtdb.TowerID, addr net.Addr) {
func (t *towerListIterator) RemoveCandidate(candidate wtdb.TowerID,
addr net.Addr) error {
t.mu.Lock()
defer t.mu.Unlock()
tower, ok := t.candidates[candidate]
if !ok {
return
return nil
}
if addr != nil {
tower.RemoveAddress(addr)
if len(tower.Addresses) == 0 {
return wtdb.ErrLastTowerAddr
}
} else {
delete(t.candidates, candidate)
}
return nil
}
// IsActive determines whether a given tower is exists within the iterator.