jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 19:09:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(net): validate discovered enr forkid (#586)

Browse Source
This commit is contained in:
Matthias Seitz
2022-12-23 12:15:07 +01:00
committed by GitHub
parent e549b29cce
commit cb58759e66
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/net/network/src/session/mod.rs
View File

@ -19,7 +19,7 @@ use reth_eth_wire::{
error::EthStreamError,
DisconnectReason, HelloMessage, Status, UnauthedEthStream, UnauthedP2PStream,
};
use reth_primitives::{ForkFilter, ForkTransition, PeerId, H256, U256};
use reth_primitives::{ForkFilter, ForkId, ForkTransition, PeerId, H256, U256};
use secp256k1::SecretKey;
use std::{
collections::HashMap,
@ -127,6 +127,12 @@ impl SessionManager {
}
}
/// Check whether the provided [`ForkId`] is compatible based on the validation rules in
/// `EIP-2124`.
pub(crate) fn is_valid_fork_id(&self, fork_id: ForkId) -> bool {
self.fork_filter.validate(fork_id).is_ok()
}
/// Returns the next unique [`SessionId`].
fn next_id(&mut self) -> SessionId {
let id = self.next_id;

11
crates/net/network/src/state.rs
View File

@ -262,8 +262,9 @@ where
DiscoveryEvent::Discovered(peer, addr) => {
self.peers_manager.add_discovered_node(peer, addr);
}
DiscoveryEvent::EnrForkId(peer, fork_id) => {
self.peers_manager.set_discovered_fork_id(peer, fork_id);
DiscoveryEvent::EnrForkId(peer_id, fork_id) => {
self.queued_messages
.push_back(StateAction::DiscoveredEnrForkId { peer_id, fork_id });
}
}
}
@ -455,4 +456,10 @@ pub(crate) enum StateAction {
/// Why the disconnect was initiated
reason: Option<DisconnectReason>,
},
/// Retrieved a [`ForkId`] from the peer via ENR request, See <https://eips.ethereum.org/EIPS/eip-868>
DiscoveredEnrForkId {
peer_id: PeerId,
/// The reported [`ForkId`] by this peer.
fork_id: ForkId,
},
}

7
crates/net/network/src/swarm.rs
View File

@ -227,6 +227,13 @@ where
let msg = PeerMessage::NewBlockHashes(hashes);
self.sessions.send_message(&peer_id, msg);
}
StateAction::DiscoveredEnrForkId { peer_id, fork_id } => {
if self.sessions.is_valid_fork_id(fork_id) {
self.state_mut().peers_mut().set_discovered_fork_id(peer_id, fork_id);
} else {
self.state_mut().peers_mut().remove_discovered_node(peer_id);
}
}
}
None
}