mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-04-26 11:32:25 +00:00
cc22e0cdf0
It seems the semantic differences between addFoundNode and addInboundNode were lost in #29572. My understanding is addFoundNode is for a node you have not contacted directly (and are unsure if is available) whereas addInboundNode is for adding nodes that have contacted the local node and we can verify they are active. handleAddNode seems to be the consolidation of those two methods, yet it bumps the node in the bucket (updating it's IP addr) even if the node was not an inbound. This PR fixes this. It wasn't originally caught in tests like TestTable_addSeenNode because the manipulation of the node object actually modified the node value used by the test. New logic is added to reject non-inbound updates unless the sequence number of the (signed) ENR increases. Inbound updates, which are published by the updated node itself, are always accepted. If an inbound update changes the endpoint, the node will be revalidated on an expedited schedule. Co-authored-by: Felix Lange <fjl@twurst.com>
119 lines
3.8 KiB
Go
119 lines
3.8 KiB
Go
// Copyright 2024 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package discover
|
|
|
|
import (
|
|
"net"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/ethereum/go-ethereum/common/mclock"
|
|
"github.com/ethereum/go-ethereum/p2p/enode"
|
|
"github.com/ethereum/go-ethereum/p2p/enr"
|
|
)
|
|
|
|
// This test checks that revalidation can handle a node disappearing while
|
|
// a request is active.
|
|
func TestRevalidation_nodeRemoved(t *testing.T) {
|
|
var (
|
|
clock mclock.Simulated
|
|
transport = newPingRecorder()
|
|
tab, db = newInactiveTestTable(transport, Config{Clock: &clock})
|
|
tr = &tab.revalidation
|
|
)
|
|
defer db.Close()
|
|
|
|
// Add a node to the table.
|
|
node := nodeAtDistance(tab.self().ID(), 255, net.IP{77, 88, 99, 1})
|
|
tab.handleAddNode(addNodeOp{node: node})
|
|
|
|
// Start a revalidation request. Schedule once to get the next start time,
|
|
// then advance the clock to that point and schedule again to start.
|
|
next := tr.run(tab, clock.Now())
|
|
clock.Run(time.Duration(next + 1))
|
|
tr.run(tab, clock.Now())
|
|
if len(tr.activeReq) != 1 {
|
|
t.Fatal("revalidation request did not start:", tr.activeReq)
|
|
}
|
|
|
|
// Delete the node.
|
|
tab.deleteInBucket(tab.bucket(node.ID()), node.ID())
|
|
|
|
// Now finish the revalidation request.
|
|
var resp revalidationResponse
|
|
select {
|
|
case resp = <-tab.revalResponseCh:
|
|
case <-time.After(1 * time.Second):
|
|
t.Fatal("timed out waiting for revalidation")
|
|
}
|
|
tr.handleResponse(tab, resp)
|
|
|
|
// Ensure the node was not re-added to the table.
|
|
if tab.getNode(node.ID()) != nil {
|
|
t.Fatal("node was re-added to Table")
|
|
}
|
|
if tr.fast.contains(node.ID()) || tr.slow.contains(node.ID()) {
|
|
t.Fatal("removed node contained in revalidation list")
|
|
}
|
|
}
|
|
|
|
// This test checks that nodes with an updated endpoint remain in the fast revalidation list.
|
|
func TestRevalidation_endpointUpdate(t *testing.T) {
|
|
var (
|
|
clock mclock.Simulated
|
|
transport = newPingRecorder()
|
|
tab, db = newInactiveTestTable(transport, Config{Clock: &clock})
|
|
tr = &tab.revalidation
|
|
)
|
|
defer db.Close()
|
|
|
|
// Add node to table.
|
|
node := nodeAtDistance(tab.self().ID(), 255, net.IP{77, 88, 99, 1})
|
|
tab.handleAddNode(addNodeOp{node: node})
|
|
|
|
// Update the record in transport, including endpoint update.
|
|
record := node.Record()
|
|
record.Set(enr.IP{100, 100, 100, 100})
|
|
record.Set(enr.UDP(9999))
|
|
nodev2 := enode.SignNull(record, node.ID())
|
|
transport.updateRecord(nodev2)
|
|
|
|
// Start a revalidation request. Schedule once to get the next start time,
|
|
// then advance the clock to that point and schedule again to start.
|
|
next := tr.run(tab, clock.Now())
|
|
clock.Run(time.Duration(next + 1))
|
|
tr.run(tab, clock.Now())
|
|
if len(tr.activeReq) != 1 {
|
|
t.Fatal("revalidation request did not start:", tr.activeReq)
|
|
}
|
|
|
|
// Now finish the revalidation request.
|
|
var resp revalidationResponse
|
|
select {
|
|
case resp = <-tab.revalResponseCh:
|
|
case <-time.After(1 * time.Second):
|
|
t.Fatal("timed out waiting for revalidation")
|
|
}
|
|
tr.handleResponse(tab, resp)
|
|
|
|
if !tr.fast.contains(node.ID()) {
|
|
t.Fatal("node not contained in fast revalidation list")
|
|
}
|
|
if node.isValidatedLive {
|
|
t.Fatal("node is marked live after endpoint change")
|
|
}
|
|
}
|