akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wtmock: prevent race conditions by not using ClientSession pointers

Browse Source 
These race conditions originate from the mock database storing and
returning pointers, rather than returning a copy.

Observed on Travis:

WARNING: DATA RACE
Read at 0x00c0003222b8 by goroutine 149:
  github.com/lightningnetwork/lnd/watchtower/wtclient.(*sessionQueue).drainBackups()
      /home/runner/work/lnd/lnd/watchtower/wtclient/session_queue.go:288 +0xed
  github.com/lightningnetwork/lnd/watchtower/wtclient.(*sessionQueue).sessionManager()
      /home/runner/work/lnd/lnd/watchtower/wtclient/session_queue.go:281 +0x450

Previous write at 0x00c0003222b8 by goroutine 93:
  github.com/lightningnetwork/lnd/watchtower/wtclient.getClientSessions()
      /home/runner/work/lnd/lnd/watchtower/wtclient/client.go:365 +0x24f
  github.com/lightningnetwork/lnd/watchtower/wtclient.(*TowerClient).handleNewTower()
      /home/runner/work/lnd/lnd/watchtower/wtclient/client.go:1063 +0x23e
  github.com/lightningnetwork/lnd/watchtower/wtclient.(*TowerClient).backupDispatcher()
      /home/runner/work/lnd/lnd/watchtower/wtclient/client.go:784 +0x10b9
This commit is contained in:
Wilmer Paulino 2020-05-14 15:28:49 -07:00
parent f6f0d3819f
commit c760700545
No known key found for this signature in database
GPG Key ID: 6DF57B9F9514972F
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
watchtower/wtmock/client_db.go
View File

@ -19,7 +19,7 @@ type ClientDB struct {
mu sync.Mutex mu sync.Mutex
summaries map[lnwire.ChannelID]wtdb.ClientChanSummary summaries map[lnwire.ChannelID]wtdb.ClientChanSummary
activeSessions map[wtdb.SessionID]*wtdb.ClientSession activeSessions map[wtdb.SessionID]wtdb.ClientSession
towerIndex map[towerPK]wtdb.TowerID towerIndex map[towerPK]wtdb.TowerID
towers map[wtdb.TowerID]*wtdb.Tower towers map[wtdb.TowerID]*wtdb.Tower
@ -31,7 +31,7 @@ type ClientDB struct {
func NewClientDB() *ClientDB { func NewClientDB() *ClientDB {
return &ClientDB{ return &ClientDB{
summaries: make(map[lnwire.ChannelID]wtdb.ClientChanSummary), summaries: make(map[lnwire.ChannelID]wtdb.ClientChanSummary),
activeSessions: make(map[wtdb.SessionID]*wtdb.ClientSession), activeSessions: make(map[wtdb.SessionID]wtdb.ClientSession),
towerIndex: make(map[towerPK]wtdb.TowerID), towerIndex: make(map[towerPK]wtdb.TowerID),
towers: make(map[wtdb.TowerID]*wtdb.Tower), towers: make(map[wtdb.TowerID]*wtdb.Tower),
indexes: make(map[wtdb.TowerID]uint32), indexes: make(map[wtdb.TowerID]uint32),
@ -62,7 +62,7 @@ func (m *ClientDB) CreateTower(lnAddr *lnwire.NetAddress) (*wtdb.Tower, error) {
} }
for id, session := range towerSessions { for id, session := range towerSessions {
session.Status = wtdb.CSessionActive session.Status = wtdb.CSessionActive
m.activeSessions[id] = session m.activeSessions[id] = *session
} }
} else { } else {
towerID = wtdb.TowerID(atomic.AddUint64(&m.nextTowerID, 1)) towerID = wtdb.TowerID(atomic.AddUint64(&m.nextTowerID, 1))
@ -122,7 +122,7 @@ func (m *ClientDB) RemoveTower(pubKey *btcec.PublicKey, addr net.Addr) error {
return wtdb.ErrTowerUnackedUpdates return wtdb.ErrTowerUnackedUpdates
} }
session.Status = wtdb.CSessionInactive session.Status = wtdb.CSessionInactive
m.activeSessions[id] = session m.activeSessions[id] = *session
} }
return nil return nil
@ -205,10 +205,11 @@ func (m *ClientDB) listClientSessions(
sessions := make(map[wtdb.SessionID]*wtdb.ClientSession) sessions := make(map[wtdb.SessionID]*wtdb.ClientSession)
for _, session := range m.activeSessions { for _, session := range m.activeSessions {
session := session
if tower != nil && *tower != session.TowerID { if tower != nil && *tower != session.TowerID {
continue continue
} }
sessions[session.ID] = session sessions[session.ID] = &session
} }
return sessions, nil return sessions, nil
@ -240,7 +241,7 @@ func (m *ClientDB) CreateClientSession(session *wtdb.ClientSession) error {
// permits us to create another session with this tower. // permits us to create another session with this tower.
delete(m.indexes, session.TowerID) delete(m.indexes, session.TowerID)
m.activeSessions[session.ID] = &wtdb.ClientSession{ m.activeSessions[session.ID] = wtdb.ClientSession{
ID: session.ID, ID: session.ID,
ClientSessionBody: wtdb.ClientSessionBody{ ClientSessionBody: wtdb.ClientSessionBody{
SeqNum: session.SeqNum, SeqNum: session.SeqNum,
@ -313,6 +314,7 @@ func (m *ClientDB) CommitUpdate(id *wtdb.SessionID,
// Save the update and increment the sequence number. // Save the update and increment the sequence number.
session.CommittedUpdates = append(session.CommittedUpdates, *update) session.CommittedUpdates = append(session.CommittedUpdates, *update)
session.SeqNum++ session.SeqNum++
m.activeSessions[*id] = session
return session.TowerLastApplied, nil return session.TowerLastApplied, nil
} }
@ -360,6 +362,7 @@ func (m *ClientDB) AckUpdate(id *wtdb.SessionID, seqNum, lastApplied uint16) err
session.AckedUpdates[seqNum] = update.BackupID session.AckedUpdates[seqNum] = update.BackupID
session.TowerLastApplied = lastApplied session.TowerLastApplied = lastApplied
m.activeSessions[*id] = session
return nil return nil
} }