forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-24 08:49:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

p2p/discover: avoid findnodeByID preferLive fallback to unverified nodes

Browse source 
FINDNODE/v4 could return unverified bucket entries when preferLive was set
but no liveness-validated peers were present, weakening eclipse resistance.
This commit is contained in:
Weixie Cui 2026-05-18 20:00:00 +08:00
parent d4027f3d46
commit 5c5f79893e
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
p2p/discover/table.go
View file

@ -286,10 +286,9 @@ func (tab *Table) refresh() <-chan struct{} {
// findnodeByID returns the n nodes in the table that are closest to the given id. // findnodeByID returns the n nodes in the table that are closest to the given id.
// This is used by the FINDNODE/v4 handler. // This is used by the FINDNODE/v4 handler.
// //
// The preferLive parameter says whether the caller wants liveness-checked results. If // The preferLive parameter says whether the caller wants liveness-checked results. When
// preferLive is true and the table contains any verified nodes, the result will not // preferLive is true, only validated-live entries are returned and unverified nodes are
// contain unverified nodes. However, if there are no verified nodes at all, the result // never mixed in; the result may be shorter than nresults or empty.
// will contain unverified nodes.
func (tab *Table) findnodeByID(target enode.ID, nresults int, preferLive bool) *nodesByDistance { func (tab *Table) findnodeByID(target enode.ID, nresults int, preferLive bool) *nodesByDistance {
tab.mutex.Lock() tab.mutex.Lock()
defer tab.mutex.Unlock() defer tab.mutex.Unlock()
@ -308,7 +307,7 @@ func (tab *Table) findnodeByID(target enode.ID, nresults int, preferLive bool) *
} }
} }
if preferLive && len(liveNodes.entries) > 0 { if preferLive {
return liveNodes return liveNodes
} }
return nodes return nodes