LumeWeb
/
libs5-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: only block peer id if we can get the id

This commit is contained in:
Derrick Hammer 2024-01-15 12:13:17 -05:00
parent 0ce9b139b1
commit def05376f5
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
service/p2p.go
View File

@ -192,15 +192,19 @@ func (p *P2PImpl) ConnectToNode(connectionUris []*url.URL, retried bool, fromPee
if p.outgoingPeerBlocklist.Contains(idString) { if p.outgoingPeerBlocklist.Contains(idString) {
p.logger.Error("outgoing peer is on blocklist", zap.String("node", connectionUri.String())) p.logger.Error("outgoing peer is on blocklist", zap.String("node", connectionUri.String()))
var fromPeerId string
if fromPeer != nil { if fromPeer != nil {
fromPeerId, err := fromPeer.Id().ToString() if fromPeer.Id() != nil {
if err != nil { fromPeerId, err = fromPeer.Id().ToString()
return err if err != nil {
return err
}
p.incomingPeerBlockList.Put(fromPeerId, true)
} }
fromPeerIP := fromPeer.GetIP() fromPeerIP := fromPeer.GetIP()
p.incomingPeerBlockList.Put(fromPeerId, true)
p.incomingIPBlocklist.Put(fromPeerIP, true) p.incomingIPBlocklist.Put(fromPeerIP, true)
err = fromPeer.End() err = fromPeer.End()
if err != nil { if err != nil {
@ -239,13 +243,18 @@ func (p *P2PImpl) ConnectToNode(connectionUris []*url.URL, retried bool, fromPee
p.outgoingPeerFailures.Put(idString, counter) p.outgoingPeerFailures.Put(idString, counter)
if counter >= p.maxOutgoingPeerFailures { if counter >= p.maxOutgoingPeerFailures {
if fromPeer != nil { if fromPeer != nil {
fromPeerId, err := fromPeer.Id().ToString() var fromPeerId string
if err != nil { if fromPeer.Id() != nil {
return err fromPeerId, err = fromPeer.Id().ToString()
if err != nil {
return err
}
p.incomingPeerBlockList.Put(fromPeerId, true)
} }
fromPeerIP := fromPeer.GetIP() fromPeerIP := fromPeer.GetIP()
p.incomingPeerBlockList.Put(fromPeerId, true)
p.incomingIPBlocklist.Put(fromPeerIP, true) p.incomingIPBlocklist.Put(fromPeerIP, true)
err = fromPeer.End() err = fromPeer.End()
if err != nil { if err != nil {