Archive
/
vented
mirror of https://github.com/Trivernis/vented.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix blocked receiver thread

Browse Source 
Signed-off-by: trivernis <trivernis@protonmail.com>
pull/1/head
trivernis 4 years ago
parent 7fb2b5d647
commit e59e26c72f
Signed by: Trivernis
GPG Key ID: DFFFCC2C7A02DB45
6 changed files with 239 additions and 70 deletions
Show Stats Download Patch File Download Diff File

2
Cargo.toml
Unescape Escape View File

@ -1,7 +1,7 @@
[package] [package]
name = "vented" name = "vented"
description = "Event driven encrypted tcp communicaton" description = "Event driven encrypted tcp communicaton"
version = "0.10.0" version = "0.10.1"
authors = ["trivernis <trivernis@protonmail.com>"] authors = ["trivernis <trivernis@protonmail.com>"]
edition = "2018" edition = "2018"
readme = "README.md" readme = "README.md"

93
src/server/data.rs
Unescape Escape View File

@ -11,24 +11,111 @@ use crate::stream::cryptostream::CryptoStream;
use crate::stream::manager::ConcurrentStreamManager; use crate::stream::manager::ConcurrentStreamManager;
use crate::utils::result::VentedError; use crate::utils::result::VentedError;
use crate::utils::sync::AsyncValue; use crate::utils::sync::AsyncValue;
use std::time::{Duration, Instant};
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct Node { pub struct Node {
pub id: String, pub id: String,
pub public_key: PublicKey, pub public_key: PublicKey,
pub address: Option<String>, pub addresses: Vec<String>,
pub trusted: bool, pub trusted: bool,
} }
#[derive(Clone, Debug)]
pub struct NodeData {
inner: Node,
state: NodeState,
}
#[derive(Clone, Debug)]
pub enum NodeState {
Alive(Instant),
Dead(Instant),
Unknown,
}
#[derive(Clone)] #[derive(Clone)]
pub(crate) struct ServerConnectionContext { pub(crate) struct ServerConnectionContext {
pub is_server: bool, pub is_server: bool,
pub node_id: String, pub node_id: String,
pub global_secret: SecretKey, pub global_secret: SecretKey,
pub known_nodes: Arc<Mutex<HashMap<String, Node>>>, pub known_nodes: Arc<Mutex<HashMap<String, NodeData>>>,
pub event_handler: Arc<Mutex<EventHandler>>, pub event_handler: Arc<Mutex<EventHandler>>,
pub forwarded_connections: Arc<Mutex<HashMap<(String, String), AsyncValue<CryptoStream, ()>>>>, pub forwarded_connections: Arc<Mutex<HashMap<(String, String), AsyncValue<CryptoStream, ()>>>>,
pub pool: Arc<Mutex<ScheduledThreadPool>>, pub sender_pool: Arc<Mutex<ScheduledThreadPool>>,
pub recv_pool: Arc<Mutex<ScheduledThreadPool>>,
pub redirect_handles: Arc<Mutex<HashMap<[u8; 16], AsyncValue<(), VentedError>>>>, pub redirect_handles: Arc<Mutex<HashMap<[u8; 16], AsyncValue<(), VentedError>>>>,
pub manager: ConcurrentStreamManager, pub manager: ConcurrentStreamManager,
} }
impl From<Node> for NodeData {
fn from(node: Node) -> Self {
Self {
inner: node,
state: NodeState::Unknown,
}
}
}
impl From<NodeData> for Node {
fn from(other: NodeData) -> Self {
other.inner
}
}
// how long is a node assumed to be in a state before rechecking is necessary
const NODE_STATE_TTL_SECONDS: u64 = 600;
impl NodeData {
/// Returns the inner node data
pub fn node(&self) -> &Node {
&self.inner
}
/// Returns a mutable reference of the inner node data
pub fn node_mut(&mut self) -> &mut Node {
&mut self.inner
}
/// Returns the state of the node
pub fn node_state(&mut self) -> &NodeState {
let ttl = Duration::from_secs(NODE_STATE_TTL_SECONDS);
match &self.state {
NodeState::Alive(since) | NodeState::Dead(since) if since.elapsed() > ttl => {
self.state = NodeState::Unknown;
log::trace!(
"Node state of {} updated to {:?}",
self.inner.id,
self.state
)
}
_ => {}
}
&self.state
}
/// Sets the state of the node
pub fn set_node_state(&mut self, state: NodeState) {
self.state = state;
log::trace!(
"Node state of {} updated to {:?}",
self.inner.id,
self.state
)
}
/// Returns if the node is dead
pub fn is_dead(&self) -> bool {
match &self.state {
NodeState::Dead(_) => true,
_ => false,
}
}
pub fn is_alive(&self) -> bool {
match &self.state {
NodeState::Alive(_) => true,
_ => false,
}
}
}

169
src/server/mod.rs
Unescape Escape View File

@ -5,7 +5,7 @@ use std::mem;
use std::net::{TcpListener, TcpStream}; use std::net::{TcpListener, TcpStream};
use std::sync::Arc; use std::sync::Arc;
use std::thread; use std::thread;
use std::time::Duration; use std::time::{Duration, Instant};
use crossbeam_utils::sync::WaitGroup; use crossbeam_utils::sync::WaitGroup;
use crypto_box::{PublicKey, SecretKey}; use crypto_box::{PublicKey, SecretKey};
@ -16,21 +16,23 @@ use x25519_dalek::StaticSecret;
use crate::event::Event; use crate::event::Event;
use crate::event_handler::EventHandler; use crate::event_handler::EventHandler;
use crate::server::data::{Node, ServerConnectionContext}; use crate::server::data::{Node, NodeData, NodeState, ServerConnectionContext};
use crate::server::server_events::{ use crate::server::server_events::{
AuthPayload, ChallengePayload, NodeInformationPayload, RedirectPayload, VersionMismatchPayload, AuthPayload, ChallengePayload, NodeInformationPayload, RedirectPayload, VersionMismatchPayload,
ACCEPT_EVENT, AUTH_EVENT, CHALLENGE_EVENT, CONNECT_EVENT, MISMATCH_EVENT, READY_EVENT, ACCEPT_EVENT, AUTH_EVENT, CHALLENGE_EVENT, CONNECT_EVENT, MISMATCH_EVENT, READY_EVENT,
REDIRECT_EVENT, REJECT_EVENT, REDIRECT_EVENT, REJECT_EVENT,
}; };
use crate::stream::cryptostream::CryptoStream; use crate::stream::cryptostream::CryptoStream;
use crate::stream::manager::ConcurrentStreamManager; use crate::stream::manager::{ConcurrentStreamManager, CONNECTION_TIMEOUT_SECONDS};
use crate::utils::result::{VentedError, VentedResult}; use crate::utils::result::{VentedError, VentedResult};
use crate::utils::sync::AsyncValue; use crate::utils::sync::AsyncValue;
use std::cmp::max;
pub mod data; pub mod data;
pub mod server_events; pub mod server_events;
pub(crate) const CRATE_VERSION: &str = env!("CARGO_PKG_VERSION"); pub(crate) const CRATE_VERSION: &str = env!("CARGO_PKG_VERSION");
pub const PROTOCOL_VERSION: &str = "1.0";
type ForwardFutureVector = Arc<Mutex<HashMap<(String, String), AsyncValue<CryptoStream, ()>>>>; type ForwardFutureVector = Arc<Mutex<HashMap<(String, String), AsyncValue<CryptoStream, ()>>>>;
@ -47,7 +49,7 @@ type ForwardFutureVector = Arc<Mutex<HashMap<(String, String), AsyncValue<Crypto
/// let nodes = vec![ /// let nodes = vec![
/// Node { /// Node {
/// id: "B".to_string(), /// id: "B".to_string(),
/// address: None, /// addresses: vec![],
/// trusted: true, /// trusted: true,
/// public_key: global_secret_b.public_key() // load it from somewhere /// public_key: global_secret_b.public_key() // load it from somewhere
/// }, /// },
@ -68,13 +70,14 @@ type ForwardFutureVector = Arc<Mutex<HashMap<(String, String), AsyncValue<Crypto
/// ``` /// ```
pub struct VentedServer { pub struct VentedServer {
forwarded_connections: ForwardFutureVector, forwarded_connections: ForwardFutureVector,
known_nodes: Arc<Mutex<HashMap<String, Node>>>, known_nodes: Arc<Mutex<HashMap<String, NodeData>>>,
event_handler: Arc<Mutex<EventHandler>>, event_handler: Arc<Mutex<EventHandler>>,
global_secret_key: SecretKey, global_secret_key: SecretKey,
node_id: String, node_id: String,
redirect_handles: Arc<Mutex<HashMap<[u8; 16], AsyncValue<(), VentedError>>>>, redirect_handles: Arc<Mutex<HashMap<[u8; 16], AsyncValue<(), VentedError>>>>,
manager: ConcurrentStreamManager, manager: ConcurrentStreamManager,
pool: Arc<Mutex<ScheduledThreadPool>>, sender_pool: Arc<Mutex<ScheduledThreadPool>>,
receiver_pool: Arc<Mutex<ScheduledThreadPool>>,
} }
impl VentedServer { impl VentedServer {
@ -95,10 +98,20 @@ impl VentedServer {
forwarded_connections: Arc::new(Mutex::new(HashMap::new())), forwarded_connections: Arc::new(Mutex::new(HashMap::new())),
global_secret_key: secret_key, global_secret_key: secret_key,
known_nodes: Arc::new(Mutex::new(HashMap::from_iter( known_nodes: Arc::new(Mutex::new(HashMap::from_iter(
nodes.iter().cloned().map(|node| (node.id.clone(), node)), nodes
.iter()
.cloned()
.map(|node| (node.id.clone(), node.into())),
))), ))),
redirect_handles: Arc::new(Mutex::new(HashMap::new())), redirect_handles: Arc::new(Mutex::new(HashMap::new())),
pool: Arc::new(Mutex::new(ScheduledThreadPool::new(num_threads))), sender_pool: Arc::new(Mutex::new(ScheduledThreadPool::new(max(
num_threads / 2,
1,
)))),
receiver_pool: Arc::new(Mutex::new(ScheduledThreadPool::new(max(
num_threads / 2,
1,
)))),
}; };
server.register_events(); server.register_events();
server.start_event_listener(); server.start_event_listener();
@ -113,11 +126,16 @@ impl VentedServer {
/// Returns the nodes known to the server /// Returns the nodes known to the server
pub fn nodes(&self) -> Vec<Node> { pub fn nodes(&self) -> Vec<Node> {
self.known_nodes.lock().values().cloned().collect() self.known_nodes
.lock()
.values()
.cloned()
.map(Node::from)
.collect()
} }
/// Returns the actual reference to the inner node list /// Returns the actual reference to the inner node list
pub fn nodes_ref(&self) -> Arc<Mutex<HashMap<String, Node>>> { pub fn nodes_ref(&self) -> Arc<Mutex<HashMap<String, NodeData>>> {
Arc::clone(&self.known_nodes) Arc::clone(&self.known_nodes)
} }
@ -180,10 +198,11 @@ impl VentedServer {
global_secret: self.global_secret_key.clone(), global_secret: self.global_secret_key.clone(),
known_nodes: Arc::clone(&self.known_nodes), known_nodes: Arc::clone(&self.known_nodes),
event_handler: Arc::clone(&self.event_handler), event_handler: Arc::clone(&self.event_handler),
pool: Arc::clone(&self.pool), sender_pool: Arc::clone(&self.sender_pool),
forwarded_connections: Arc::clone(&self.forwarded_connections), forwarded_connections: Arc::clone(&self.forwarded_connections),
redirect_handles: Arc::clone(&self.redirect_handles), redirect_handles: Arc::clone(&self.redirect_handles),
manager: self.manager.clone(), manager: self.manager.clone(),
recv_pool: Arc::clone(&self.receiver_pool),
} }
} }
@ -199,6 +218,9 @@ impl VentedServer {
move || { move || {
mem::drop(wg); mem::drop(wg);
while let Ok((origin, event)) = receiver.recv() { while let Ok((origin, event)) = receiver.recv() {
if let Some(node) = context.known_nodes.lock().get_mut(&origin) {
node.set_node_state(NodeState::Alive(Instant::now()));
}
let responses = event_handler.lock().handle_event(event); let responses = event_handler.lock().handle_event(event);
for response in responses { for response in responses {
@ -220,34 +242,64 @@ impl VentedServer {
event: Event, event: Event,
redirect: bool, redirect: bool,
) -> AsyncValue<(), VentedError> { ) -> AsyncValue<(), VentedError> {
log::trace!(
"Emitting: '{}' from {} to {}",
event.name,
context.node_id,
target
);
if context.manager.has_connection(target) { if context.manager.has_connection(target) {
log::trace!("Reusing existing connection.");
context.manager.send(target, event) context.manager.send(target, event)
} else { } else {
let future = AsyncValue::new(); let future = AsyncValue::new();
context.pool.lock().execute({ context.sender_pool.lock().execute({
let mut future = AsyncValue::clone(&future); let mut future = AsyncValue::clone(&future);
let node_id = target.clone(); let node_id = target.clone();
let context = context.clone(); let context = context.clone();
move || { move || {
log::trace!( log::trace!("Trying to establish connection...");
"Trying to redirect the event to a different node to be sent to target node..." let node_state = if let Ok(connection) =
); Self::get_connection(context.clone(), &node_id)
if let Ok(connection) = Self::get_connection(context.clone(), &node_id) { {
if let Err(e) = context.manager.add_connection(connection) { if let Err(e) = context.manager.add_connection(connection) {
future.reject(e); future.reject(e);
return; return;
} }
log::trace!("Established new connection."); log::trace!("Established new connection.");
let result = context.manager.send(&node_id, event).get_value(); let result = context.manager.send(&node_id, event).get_value();
future.result(result); match result {
Ok(_) => {
future.resolve(());
NodeState::Alive(Instant::now())
}
Err(e) => {
future.reject(e);
NodeState::Dead(Instant::now())
}
}
} else if redirect { } else if redirect {
log::trace!("Trying to send event redirected"); log::trace!("Trying to use a proxy node...");
let result = Self::send_event_redirected(context, &node_id, event); let result = Self::send_event_redirected(context.clone(), &node_id, event);
future.result(result); match result {
Ok(_) => {
future.resolve(());
NodeState::Alive(Instant::now())
}
Err(e) => {
future.reject(e);
NodeState::Dead(Instant::now())
}
}
} else { } else {
future.reject(VentedError::UnreachableNode(node_id)) log::trace!("Failed to emit event to node {}", node_id);
future.reject(VentedError::UnreachableNode(node_id.clone()));
NodeState::Dead(Instant::now())
};
if let Some(node) = context.known_nodes.lock().get_mut(&node_id) {
node.set_node_state(node_state);
} }
} }
}); });
@ -266,14 +318,14 @@ impl VentedServer {
.known_nodes .known_nodes
.lock() .lock()
.values() .values()
.filter(|node| node.address.is_some()) .filter(|node| !node.node().addresses.is_empty() && node.is_alive())
.cloned() .cloned()
.collect::<Vec<Node>>(); .collect::<Vec<NodeData>>();
for node in public_nodes { for node in public_nodes {
let payload = RedirectPayload::new( let payload = RedirectPayload::new(
context.node_id.clone(), context.node_id.clone(),
node.id.clone(), node.node().id.clone(),
target.clone(), target.clone(),
event.clone().as_bytes(), event.clone().as_bytes(),
); );
@ -285,17 +337,21 @@ impl VentedServer {
if let Err(e) = Self::send_event( if let Err(e) = Self::send_event(
context.clone(), context.clone(),
&node.id, &node.node().id,
Event::with_payload(REDIRECT_EVENT, &payload), Event::with_payload(REDIRECT_EVENT, &payload),
false, false,
) )
.get_value() .get_value()
{ {
log::error!("Failed to redirect via {}: {}", node.id, e); log::error!("Failed to redirect via {}: {}", node.node().id, e);
} }
if let Some(Ok(_)) = future.get_value_with_timeout(Duration::from_secs(10)) { if let Some(Ok(_)) =
future.get_value_with_timeout(Duration::from_secs(CONNECTION_TIMEOUT_SECONDS))
{
return Ok(()); return Ok(());
} else {
log::error!("Failed to redirect via {}: Timeout", node.node().id);
} }
} }
@ -306,12 +362,14 @@ impl VentedServer {
/// then establishing an encrypted connection /// then establishing an encrypted connection
fn handle_connection(context: ServerConnectionContext, stream: TcpStream) -> VentedResult<()> { fn handle_connection(context: ServerConnectionContext, stream: TcpStream) -> VentedResult<()> {
let event_handler = Arc::clone(&context.event_handler); let event_handler = Arc::clone(&context.event_handler);
stream.set_read_timeout(Some(Duration::from_secs(CONNECTION_TIMEOUT_SECONDS)))?;
stream.set_write_timeout(Some(Duration::from_secs(CONNECTION_TIMEOUT_SECONDS)))?;
log::trace!( log::trace!(
"Received connection from {}", "Received connection from {}",
stream.peer_addr().expect("Failed to get peer address") stream.peer_addr().expect("Failed to get peer address")
); );
context.pool.lock().execute({ context.recv_pool.lock().execute({
let context = context.clone(); let context = context.clone();
move || { move || {
let manager = context.manager.clone(); let manager = context.manager.clone();
@ -349,15 +407,27 @@ impl VentedServer {
.cloned() .cloned()
.ok_or(VentedError::UnknownNode(target.clone()))?; .ok_or(VentedError::UnknownNode(target.clone()))?;
if let Some(address) = target_node.address { log::trace!("Connecting to known addresses");
log::trace!("Connecting to known address");
for address in &target_node.node().addresses {
Self::connect(context, address) match Self::connect(context.clone(), address.clone()) {
} else { Ok(stream) => return Ok(stream),
log::trace!("All direct connection attempts to {} failed", target); Err(e) => {
log::error!("Failed to connect to node {}'s address: {}", target, e);
Err(VentedError::UnreachableNode(target.clone())) context
.known_nodes
.lock()
.get_mut(target)
.unwrap()
.node_mut()
.addresses
.retain(|a| a != address);
}
}
} }
log::trace!("All direct connection attempts to {} failed", target);
Err(VentedError::UnreachableNode(target.clone()))
} }
/// Establishes a crypto stream for the given stream /// Establishes a crypto stream for the given stream
@ -365,9 +435,6 @@ impl VentedServer {
context: ServerConnectionContext, context: ServerConnectionContext,
stream: TcpStream, stream: TcpStream,
) -> VentedResult<CryptoStream> { ) -> VentedResult<CryptoStream> {
stream.set_read_timeout(Some(Duration::from_secs(10)))?;
stream.set_write_timeout(Some(Duration::from_secs(10)))?;
let (_, stream) = VentedServer::perform_key_exchange( let (_, stream) = VentedServer::perform_key_exchange(
context.is_server, context.is_server,
stream, stream,
@ -385,6 +452,8 @@ impl VentedServer {
address: String, address: String,
) -> VentedResult<CryptoStream> { ) -> VentedResult<CryptoStream> {
let stream = TcpStream::connect(address)?; let stream = TcpStream::connect(address)?;
stream.set_read_timeout(Some(Duration::from_secs(CONNECTION_TIMEOUT_SECONDS)))?;
stream.set_write_timeout(Some(Duration::from_secs(CONNECTION_TIMEOUT_SECONDS)))?;
context.is_server = false; context.is_server = false;
let stream = Self::get_crypto_stream(context, stream)?; let stream = Self::get_crypto_stream(context, stream)?;
@ -397,7 +466,7 @@ impl VentedServer {
stream: TcpStream, stream: TcpStream,
own_node_id: String, own_node_id: String,
global_secret: SecretKey, global_secret: SecretKey,
known_nodes: Arc<Mutex<HashMap<String, Node>>>, known_nodes: Arc<Mutex<HashMap<String, NodeData>>>,
) -> VentedResult<(String, CryptoStream)> { ) -> VentedResult<(String, CryptoStream)> {
let secret_key = SecretKey::generate(&mut rand::thread_rng()); let secret_key = SecretKey::generate(&mut rand::thread_rng());
if is_server { if is_server {
@ -425,7 +494,7 @@ impl VentedServer {
secret_key: &SecretKey, secret_key: &SecretKey,
own_node_id: String, own_node_id: String,
global_secret: SecretKey, global_secret: SecretKey,
known_nodes: Arc<Mutex<HashMap<String, Node>>>, known_nodes: Arc<Mutex<HashMap<String, NodeData>>>,
) -> VentedResult<(String, CryptoStream)> { ) -> VentedResult<(String, CryptoStream)> {
stream.write( stream.write(
&Event::with_payload( &Event::with_payload(
@ -433,7 +502,7 @@ impl VentedServer {
&NodeInformationPayload { &NodeInformationPayload {
public_key: secret_key.public_key().to_bytes(), public_key: secret_key.public_key().to_bytes(),
node_id: own_node_id, node_id: own_node_id,
vented_version: CRATE_VERSION.to_string(), vented_version: PROTOCOL_VERSION.to_string(),
}, },
) )
.as_bytes(), .as_bytes(),
@ -450,11 +519,11 @@ impl VentedServer {
vented_version, vented_version,
} = event.get_payload::<NodeInformationPayload>().unwrap(); } = event.get_payload::<NodeInformationPayload>().unwrap();
if !Self::compare_version(&vented_version, CRATE_VERSION) { if !Self::compare_version(&vented_version, PROTOCOL_VERSION) {
stream.write( stream.write(
&Event::with_payload( &Event::with_payload(
MISMATCH_EVENT, MISMATCH_EVENT,
&VersionMismatchPayload::new(CRATE_VERSION, &vented_version), &VersionMismatchPayload::new(PROTOCOL_VERSION, &vented_version),
) )
.as_bytes(), .as_bytes(),
)?; )?;
@ -475,7 +544,7 @@ impl VentedServer {
let mut stream = CryptoStream::new(node_id.clone(), stream, &public_key, &secret_key)?; let mut stream = CryptoStream::new(node_id.clone(), stream, &public_key, &secret_key)?;
log::trace!("Authenticating recipient..."); log::trace!("Authenticating recipient...");
let key_a = Self::authenticate_other(&mut stream, node_data.public_key)?; let key_a = Self::authenticate_other(&mut stream, node_data.node().public_key)?;
log::trace!("Authenticating self..."); log::trace!("Authenticating self...");
let key_b = let key_b =
Self::authenticate_self(&mut stream, StaticSecret::from(global_secret.to_bytes()))?; Self::authenticate_self(&mut stream, StaticSecret::from(global_secret.to_bytes()))?;
@ -497,7 +566,7 @@ impl VentedServer {
secret_key: &SecretKey, secret_key: &SecretKey,
own_node_id: String, own_node_id: String,
global_secret: SecretKey, global_secret: SecretKey,
known_nodes: Arc<Mutex<HashMap<String, Node>>>, known_nodes: Arc<Mutex<HashMap<String, NodeData>>>,
) -> VentedResult<(String, CryptoStream)> { ) -> VentedResult<(String, CryptoStream)> {
let event = Event::from_bytes(&mut stream)?; let event = Event::from_bytes(&mut stream)?;
if event.name != CONNECT_EVENT { if event.name != CONNECT_EVENT {
@ -509,11 +578,11 @@ impl VentedServer {
vented_version, vented_version,
} = event.get_payload::<NodeInformationPayload>().unwrap(); } = event.get_payload::<NodeInformationPayload>().unwrap();
if !Self::compare_version(&vented_version, CRATE_VERSION) { if !Self::compare_version(&vented_version, PROTOCOL_VERSION) {
stream.write( stream.write(
&Event::with_payload( &Event::with_payload(
MISMATCH_EVENT, MISMATCH_EVENT,
&VersionMismatchPayload::new(CRATE_VERSION, &vented_version), &VersionMismatchPayload::new(PROTOCOL_VERSION, &vented_version),
) )
.as_bytes(), .as_bytes(),
)?; )?;
@ -536,7 +605,7 @@ impl VentedServer {
&NodeInformationPayload { &NodeInformationPayload {
public_key: secret_key.public_key().to_bytes(), public_key: secret_key.public_key().to_bytes(),
node_id: own_node_id, node_id: own_node_id,
vented_version: CRATE_VERSION.to_string(), vented_version: PROTOCOL_VERSION.to_string(),
}, },
) )
.as_bytes(), .as_bytes(),
@ -549,7 +618,7 @@ impl VentedServer {
let key_a = let key_a =
Self::authenticate_self(&mut stream, StaticSecret::from(global_secret.to_bytes()))?; Self::authenticate_self(&mut stream, StaticSecret::from(global_secret.to_bytes()))?;
log::trace!("Authenticating recipient..."); log::trace!("Authenticating recipient...");
let key_b = Self::authenticate_other(&mut stream, node_data.public_key)?; let key_b = Self::authenticate_other(&mut stream, node_data.node().public_key)?;
log::trace!("Connection fully authenticated."); log::trace!("Connection fully authenticated.");
let pre_secret = StaticSecret::from(secret_key.to_bytes()).diffie_hellman(&public_key); let pre_secret = StaticSecret::from(secret_key.to_bytes()).diffie_hellman(&public_key);

21
src/server/server_events.rs
Unescape Escape View File

@ -94,7 +94,7 @@ pub struct NodeListPayload {
pub struct NodeListElement { pub struct NodeListElement {
pub id: String, pub id: String,
pub public_key: [u8; 32], pub public_key: [u8; 32],
pub address: Option<String>, pub addresses: Vec<String>,
} }
impl VentedServer { impl VentedServer {
@ -122,7 +122,7 @@ impl VentedServer {
}); });
self.on(REDIRECT_EVENT, { self.on(REDIRECT_EVENT, {
let manager = self.manager.clone(); let manager = self.manager.clone();
let pool = Arc::clone(&self.pool); let pool = Arc::clone(&self.sender_pool);
move |event| { move |event| {
let payload = event.get_payload::<RedirectPayload>().ok()?; let payload = event.get_payload::<RedirectPayload>().ok()?;
@ -157,7 +157,7 @@ impl VentedServer {
self.on(REDIRECT_REDIRECTED_EVENT, { self.on(REDIRECT_REDIRECTED_EVENT, {
let event_handler = Arc::clone(&self.event_handler); let event_handler = Arc::clone(&self.event_handler);
let manager = self.manager.clone(); let manager = self.manager.clone();
let pool = self.pool.clone(); let pool = self.sender_pool.clone();
let known_nodes = Arc::clone(&self.known_nodes); let known_nodes = Arc::clone(&self.known_nodes);
move |event| { move |event| {
@ -204,7 +204,7 @@ impl VentedServer {
let mut own_nodes = node_list.lock(); let mut own_nodes = node_list.lock();
let origin = event.origin?; let origin = event.origin?;
if !own_nodes.get(&origin)?.trusted { if !own_nodes.get(&origin)?.node().trusted {
log::warn!("Untrusted node '{}' tried to send network update!", origin); log::warn!("Untrusted node '{}' tried to send network update!", origin);
return None; return None;
} }
@ -218,8 +218,9 @@ impl VentedServer {
id: node.id, id: node.id,
trusted: false, trusted: false,
public_key: PublicKey::from(node.public_key), public_key: PublicKey::from(node.public_key),
address: node.address, addresses: node.addresses,
}, }
.into(),
); );
new_nodes += 1; new_nodes += 1;
} }
@ -237,11 +238,11 @@ impl VentedServer {
let nodes = node_list let nodes = node_list
.lock() .lock()
.values() .values()
.filter(|node| node.id != sender_id) .filter(|node| node.node().id != sender_id)
.map(|node| NodeListElement { .map(|node| NodeListElement {
id: node.id.clone(), id: node.node().id.clone(),
address: node.address.clone(), addresses: node.node().addresses.clone(),
public_key: node.public_key.to_bytes(), public_key: node.node().public_key.to_bytes(),
}) })
.collect(); .collect();

4
src/stream/manager.rs
Unescape Escape View File

@ -15,7 +15,7 @@ use crate::utils::sync::AsyncValue;
use crate::WaitGroup; use crate::WaitGroup;
const MAX_ENQUEUED_EVENTS: usize = 50; const MAX_ENQUEUED_EVENTS: usize = 50;
const SEND_TIMEOUT_SECONDS: u64 = 60; pub const CONNECTION_TIMEOUT_SECONDS: u64 = 5;
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct ConcurrentStreamManager { pub struct ConcurrentStreamManager {
@ -55,7 +55,7 @@ impl ConcurrentStreamManager {
if let Some(emitter) = self.emitters.lock().get(target) { if let Some(emitter) = self.emitters.lock().get(target) {
if let Err(_) = emitter.send_timeout( if let Err(_) = emitter.send_timeout(
(event, value.clone()), (event, value.clone()),
Duration::from_secs(SEND_TIMEOUT_SECONDS), Duration::from_secs(CONNECTION_TIMEOUT_SECONDS),
) { ) {
value.reject(VentedError::UnreachableNode(target.clone())); value.reject(VentedError::UnreachableNode(target.clone()));
} }

20
tests/test_communication.rs
Unescape Escape View File

@ -25,24 +25,33 @@ fn test_server_communication() {
let nodes = vec![ let nodes = vec![
Node { Node {
id: "A".to_string(), id: "A".to_string(),
address: Some("localhost:22222".to_string()), addresses: vec!["localhost:22222".to_string()],
public_key: global_secret_a.public_key(), public_key: global_secret_a.public_key(),
trusted: true, trusted: true,
}, },
Node { Node {
id: "B".to_string(), id: "B".to_string(),
address: None, addresses: vec![],
public_key: global_secret_b.public_key(), public_key: global_secret_b.public_key(),
trusted: false, trusted: false,
}, },
Node { Node {
id: "C".to_string(), id: "C".to_string(),
address: None, addresses: vec![],
public_key: global_secret_c.public_key(), public_key: global_secret_c.public_key(),
trusted: false, trusted: false,
}, },
]; ];
let mut server_a = VentedServer::new("A".to_string(), global_secret_a, nodes.clone(), 2, 100); let mut nodes_a = nodes.clone();
for i in 0..10 {
nodes_a.push(Node {
id: format!("Node-{}", i),
addresses: vec!["192.168.178.1".to_string()],
public_key: global_secret_c.public_key(),
trusted: false,
})
}
let mut server_a = VentedServer::new("A".to_string(), global_secret_a, nodes_a, 20, 100);
let mut server_b = VentedServer::new("B".to_string(), global_secret_b, nodes.clone(), 3, 100); let mut server_b = VentedServer::new("B".to_string(), global_secret_b, nodes.clone(), 3, 100);
let server_c = VentedServer::new("C".to_string(), global_secret_c, nodes, 3, 100); let server_c = VentedServer::new("C".to_string(), global_secret_c, nodes, 3, 100);
let wg = server_a.listen("localhost:22222".to_string()); let wg = server_a.listen("localhost:22222".to_string());
@ -63,6 +72,9 @@ fn test_server_communication() {
None None
} }
}); });
for i in 0..10 {
server_a.emit(format!("Nodes-{}", i), Event::new("ping"));
}
server_b server_b
.emit("A", Event::new(NODE_LIST_REQUEST_EVENT)) .emit("A", Event::new(NODE_LIST_REQUEST_EVENT))
.on_success(|_| println!("Success")) .on_success(|_| println!("Success"))

Write Preview
Loading…
Cancel
Save