mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disconnect peers on failed handshakes

This commit is contained in:
Dr. Maxim Orlovsky 2022-11-14 14:27:15 +01:00 committed by Alexis Sellier
parent e9ae5897f7
commit 4d77f95c21
No known key found for this signature in database
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
radicle-node/src/service/session.rs
View File

@ -51,6 +51,8 @@ pub enum Error {
Misbehavior, Misbehavior,
#[error("peer timed out")] #[error("peer timed out")]
Timeout, Timeout,
#[error("handshake error")]
Handshake(String),
} }
/// A peer session. Each connected peer will have one session. /// A peer session. Each connected peer will have one session.

22
radicle-node/src/wire.rs
View File

@ -22,7 +22,7 @@ use crate::identity::Id;
use crate::node; use crate::node;
use crate::service; use crate::service;
use crate::service::reactor::Io; use crate::service::reactor::Io;
use crate::service::{filter, routing}; use crate::service::{filter, routing, session};
use crate::storage::refs::Refs; use crate::storage::refs::Refs;
use crate::storage::refs::SignedRefs; use crate::storage::refs::SignedRefs;
use crate::storage::WriteStorage; use crate::storage::WriteStorage;
@ -433,7 +433,7 @@ pub struct Inbox<T: Transcode> {
#[derive(Debug)] #[derive(Debug)]
pub struct Wire<R, S, W, G, H: Handshake> { pub struct Wire<R, S, W, G, H: Handshake> {
handshakes: HashMap<net::SocketAddr, H>, handshakes: HashMap<net::SocketAddr, H>,
handshake_queue: VecDeque<(net::SocketAddr, Vec<u8>)>, inner_queue: VecDeque<nakamoto::Io<service::Event, service::DisconnectReason>>,
inboxes: HashMap<net::SocketAddr, Inbox<H::Transcoder>>, inboxes: HashMap<net::SocketAddr, Inbox<H::Transcoder>>,
inner: service::Service<R, S, W, G>, inner: service::Service<R, S, W, G>,
} }
@ -442,7 +442,7 @@ impl<R, S, W, G, H: Handshake> Wire<R, S, W, G, H> {
pub fn new(inner: service::Service<R, S, W, G>) -> Self { pub fn new(inner: service::Service<R, S, W, G>) -> Self {
Self { Self {
handshakes: HashMap::new(), handshakes: HashMap::new(),
handshake_queue: Default::default(), inner_queue: Default::default(),
inboxes: HashMap::new(), inboxes: HashMap::new(),
inner, inner,
} }
@ -504,14 +504,16 @@ where
HandshakeResult::Next(handshake, reply) => { HandshakeResult::Next(handshake, reply) => {
self.handshakes.insert(*addr, handshake); self.handshakes.insert(*addr, handshake);
if !reply.is_empty() { if !reply.is_empty() {
self.handshake_queue.push_back((*addr, reply)); self.inner_queue
.push_back(nakamoto::Io::Write(*addr, reply));
} }
return; return;
} }
HandshakeResult::Complete(transcoder, reply) => { HandshakeResult::Complete(transcoder, reply) => {
log::debug!("handshake with peer {} is complete", addr); log::debug!("handshake with peer {} is complete", addr);
if !reply.is_empty() { if !reply.is_empty() {
self.handshake_queue.push_back((*addr, reply)); self.inner_queue
.push_back(nakamoto::Io::Write(*addr, reply));
} }
self.inboxes.insert( self.inboxes.insert(
*addr, *addr,
@ -523,6 +525,12 @@ where
} }
HandshakeResult::Error(err) => { HandshakeResult::Error(err) => {
log::error!("invalid handshake input. Details: {}", err); log::error!("invalid handshake input. Details: {}", err);
self.inner_queue.push_back(nakamoto::Io::Disconnect(
*addr,
service::DisconnectReason::Error(session::Error::Handshake(
err.to_string(),
)),
));
return; return;
} }
} }
@ -559,8 +567,8 @@ impl<R, S, W, G, H: Handshake> Iterator for Wire<R, S, W, G, H> {
type Item = nakamoto::Io<service::Event, service::DisconnectReason>; type Item = nakamoto::Io<service::Event, service::DisconnectReason>;
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
if let Some((addr, handshake_data)) = self.handshake_queue.pop_front() { if let Some(event) = self.inner_queue.pop_front() {
return Some(nakamoto::Io::Write(addr, handshake_data)); return Some(event);
} }
match self.inner.next() { match self.inner.next() {