grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prevent connecting to self (#2997)

Browse Source
This commit is contained in:
Arkadiy Paronyan 2016-10-31 12:54:50 +01:00 committed by GitHub
parent 455059f6b1
commit 568a18d8bd
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
util/network/src/discovery.rs
View File

@ -130,7 +130,7 @@ impl Discovery {
/// Add a new node to discovery table. Pings the node. /// Add a new node to discovery table. Pings the node.
pub fn add_node(&mut self, e: NodeEntry) { pub fn add_node(&mut self, e: NodeEntry) {
if e.endpoint.is_allowed(self.allow_ips) { if self.is_allowed(&e) {
let endpoint = e.endpoint.clone(); let endpoint = e.endpoint.clone();
self.update_node(e); self.update_node(e);
self.ping(&endpoint); self.ping(&endpoint);
@ -146,7 +146,7 @@ impl Discovery {
/// Add a list of known nodes to the table. /// Add a list of known nodes to the table.
pub fn init_node_list(&mut self, mut nodes: Vec<NodeEntry>) { pub fn init_node_list(&mut self, mut nodes: Vec<NodeEntry>) {
for n in nodes.drain(..) { for n in nodes.drain(..) {
if n.endpoint.is_allowed(self.allow_ips) { if self.is_allowed(&n) {
self.update_node(n); self.update_node(n);
} }
} }
@ -399,6 +399,10 @@ impl Discovery {
Ok(()) Ok(())
} }
fn is_allowed(&self, entry: &NodeEntry) -> bool {
entry.endpoint.is_allowed(self.allow_ips) && entry.id != self.id
}
fn on_ping(&mut self, rlp: &UntrustedRlp, node: &NodeId, from: &SocketAddr) -> Result<Option<TableUpdates>, NetworkError> { fn on_ping(&mut self, rlp: &UntrustedRlp, node: &NodeId, from: &SocketAddr) -> Result<Option<TableUpdates>, NetworkError> {
trace!(target: "discovery", "Got Ping from {:?}", &from); trace!(target: "discovery", "Got Ping from {:?}", &from);
let source = try!(NodeEndpoint::from_rlp(&try!(rlp.at(1)))); let source = try!(NodeEndpoint::from_rlp(&try!(rlp.at(1))));
@ -409,7 +413,7 @@ impl Discovery {
let entry = NodeEntry { id: node.clone(), endpoint: source.clone() }; let entry = NodeEntry { id: node.clone(), endpoint: source.clone() };
if !entry.endpoint.is_valid() { if !entry.endpoint.is_valid() {
debug!(target: "discovery", "Got bad address: {:?}", entry); debug!(target: "discovery", "Got bad address: {:?}", entry);
} else if !entry.endpoint.is_allowed(self.allow_ips) { } else if !self.is_allowed(&entry) {
debug!(target: "discovery", "Address not allowed: {:?}", entry); debug!(target: "discovery", "Address not allowed: {:?}", entry);
} else { } else {
self.update_node(entry.clone()); self.update_node(entry.clone());
@ -484,15 +488,15 @@ impl Discovery {
debug!(target: "discovery", "Bad address: {:?}", endpoint); debug!(target: "discovery", "Bad address: {:?}", endpoint);
continue; continue;
} }
if !endpoint.is_allowed(self.allow_ips) {
debug!(target: "discovery", "Address not allowed: {:?}", endpoint);
continue;
}
let node_id: NodeId = try!(r.val_at(3)); let node_id: NodeId = try!(r.val_at(3));
if node_id == self.id { if node_id == self.id {
continue; continue;
} }
let entry = NodeEntry { id: node_id.clone(), endpoint: endpoint }; let entry = NodeEntry { id: node_id.clone(), endpoint: endpoint };
if !self.is_allowed(&entry) {
debug!(target: "discovery", "Address not allowed: {:?}", entry);
continue;
}
added.insert(node_id, entry.clone()); added.insert(node_id, entry.clone());
self.ping(&entry.endpoint); self.ping(&entry.endpoint);
self.update_node(entry); self.update_node(entry);

6
util/network/src/host.rs
View File

@ -634,14 +634,14 @@ impl Host {
} }
fn connect_peers(&self, io: &IoContext<NetworkIoMessage>) { fn connect_peers(&self, io: &IoContext<NetworkIoMessage>) {
let (min_peers, mut pin, max_handshakes, allow_ips) = { let (min_peers, mut pin, max_handshakes, allow_ips, self_id) = {
let info = self.info.read(); let info = self.info.read();
if info.capabilities.is_empty() { if info.capabilities.is_empty() {
return; return;
} }
let config = &info.config; let config = &info.config;
(config.min_peers, config.non_reserved_mode == NonReservedPeerMode::Deny, config.max_handshakes as usize, config.allow_ips) (config.min_peers, config.non_reserved_mode == NonReservedPeerMode::Deny, config.max_handshakes as usize, config.allow_ips, info.id().clone())
}; };
let session_count = self.session_count(); let session_count = self.session_count();
@ -672,7 +672,7 @@ impl Host {
let max_handshakes_per_round = max_handshakes / 2; let max_handshakes_per_round = max_handshakes / 2;
let mut started: usize = 0; let mut started: usize = 0;
for id in nodes.filter(|ref id| !self.have_session(id) && !self.connecting_to(id)) for id in nodes.filter(|id| !self.have_session(id) && !self.connecting_to(id) && *id != self_id)
.take(min(max_handshakes_per_round, max_handshakes - handshake_count)) { .take(min(max_handshakes_per_round, max_handshakes - handshake_count)) {
self.connect_peer(&id, io); self.connect_peer(&id, io);
started += 1; started += 1;