3e23bdf3c0
* added additional workspace-wide dependencies * Added conditional serialization on 'BinaryBuildInformationOwned' * initial framework for service provider messages * updated request/response tags to account for existing variants of Socks5Message * handling legacy deserialization * another serialization revamp to account for legacy version * legacy client working with versioned network requester * socks5 client deserializing responses into updated structures * using new structures for sending in socks5 client * SendRequest wrapper for Request::Send variant * created named fields for all variants of 'ControllerCommand' * Versioning socks5 requests + moving to proper Socks5Request struct * Updated backwards compatible Socks5Response * unused imports * poc ServiceProvider trait * wip * implemented 'ServiceProvider' trait on the Network Requester * Socks5RequestError * added properly serialized ErrorResponse to ControlResponse * fixed version serialization + feature selection * handling of version control requests * improved SocksProxyError by providing more concrete variants and removing generic case * got rid of ServiceProviderClient trait and wrote simple example showing control requests * tests for serialisation backwards compatibility * post-merge fixes due to method renaming * enum boxing to make clippy happier * making sure to not drop buffer channel when starting `DirectClient` * Using nym-sdk in the example * Replaced printing version to stdout with proper log call
290 lines
10 KiB
Rust
290 lines
10 KiB
Rust
// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
use client_connections::{ConnectionCommand, ConnectionCommandSender};
|
|
use futures::channel::mpsc;
|
|
use futures::StreamExt;
|
|
use log::*;
|
|
use ordered_buffer::{OrderedMessage, OrderedMessageBuffer, ReadContiguousData};
|
|
use socks5_requests::{ConnectionId, NetworkData, SendRequest};
|
|
use std::{
|
|
collections::{HashMap, HashSet},
|
|
time::Duration,
|
|
};
|
|
use task::TaskClient;
|
|
use tokio::time;
|
|
|
|
/// A generic message produced after reading from a socket/connection. It includes data that was
|
|
/// actually read alongside boolean indicating whether the connection got closed so that
|
|
/// remote could act accordingly.
|
|
#[derive(Debug)]
|
|
pub struct ConnectionMessage {
|
|
pub payload: Vec<u8>,
|
|
pub socket_closed: bool,
|
|
}
|
|
|
|
/// Channel responsible for sending data that was received from mix network into particular connection.
|
|
/// Data includes the actual payload that is to be written onto the connection
|
|
/// alongside boolean indicating whether the remote connection was closed after producing this message,
|
|
/// so that the local connection should also shut down.
|
|
pub type ConnectionSender = mpsc::UnboundedSender<ConnectionMessage>;
|
|
|
|
/// Receiver part of the [`ConnectionSender`]
|
|
pub type ConnectionReceiver = mpsc::UnboundedReceiver<ConnectionMessage>;
|
|
|
|
pub type ControllerSender = mpsc::UnboundedSender<ControllerCommand>;
|
|
pub type ControllerReceiver = mpsc::UnboundedReceiver<ControllerCommand>;
|
|
|
|
pub enum ControllerCommand {
|
|
Insert {
|
|
connection_id: ConnectionId,
|
|
connection_sender: ConnectionSender,
|
|
},
|
|
Remove {
|
|
connection_id: ConnectionId,
|
|
},
|
|
Send {
|
|
connection_id: ConnectionId,
|
|
data: Vec<u8>,
|
|
is_closed: bool,
|
|
},
|
|
}
|
|
|
|
impl From<NetworkData> for ControllerCommand {
|
|
fn from(value: NetworkData) -> Self {
|
|
ControllerCommand::Send {
|
|
connection_id: value.connection_id,
|
|
data: value.data,
|
|
is_closed: value.is_closed,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<SendRequest> for ControllerCommand {
|
|
fn from(value: SendRequest) -> Self {
|
|
ControllerCommand::Send {
|
|
connection_id: value.conn_id,
|
|
data: value.data,
|
|
is_closed: value.local_closed,
|
|
}
|
|
}
|
|
}
|
|
|
|
struct ActiveConnection {
|
|
is_closed: bool,
|
|
closed_at_index: Option<u64>,
|
|
connection_sender: Option<ConnectionSender>,
|
|
ordered_buffer: OrderedMessageBuffer,
|
|
}
|
|
|
|
impl ActiveConnection {
|
|
fn write_to_buf(&mut self, payload: Vec<u8>, is_closed: bool) {
|
|
let ordered_message = match OrderedMessage::try_from_bytes(payload) {
|
|
Ok(msg) => msg,
|
|
Err(err) => {
|
|
error!("Malformed ordered message - {err}");
|
|
return;
|
|
}
|
|
};
|
|
if is_closed {
|
|
self.closed_at_index = Some(ordered_message.index);
|
|
}
|
|
self.ordered_buffer.write(ordered_message);
|
|
}
|
|
|
|
fn read_from_buf(&mut self) -> Option<ReadContiguousData> {
|
|
self.ordered_buffer.read()
|
|
}
|
|
}
|
|
|
|
#[derive(PartialEq, Eq)]
|
|
pub enum BroadcastActiveConnections {
|
|
On,
|
|
Off,
|
|
}
|
|
|
|
/// Controller represents a way of managing multiple open connections that are used for socks5
|
|
/// proxy.
|
|
pub struct Controller {
|
|
active_connections: HashMap<ConnectionId, ActiveConnection>,
|
|
receiver: ControllerReceiver,
|
|
|
|
// TODO: this will need to be either completely removed (from code) or periodically cleaned
|
|
// to avoid memory issues
|
|
recently_closed: HashSet<ConnectionId>,
|
|
|
|
// Broadcast closed connections
|
|
client_connection_tx: ConnectionCommandSender,
|
|
|
|
// The controller can broadcast active connections. This is useful in the network-requester
|
|
// where its used to query the client for lane queue lengths
|
|
broadcast_connections: BroadcastActiveConnections,
|
|
|
|
// TODO: this can potentially be abused to ddos and kill provider. Not sure at this point
|
|
// how to handle it more gracefully
|
|
|
|
// buffer for messages received before connection was established due to mixnet being able to
|
|
// un-order messages. Note we don't ever expect to have more than 1-2 messages per connection here
|
|
pending_messages: HashMap<ConnectionId, Vec<(Vec<u8>, bool)>>,
|
|
|
|
shutdown: TaskClient,
|
|
}
|
|
|
|
impl Controller {
|
|
pub fn new(
|
|
client_connection_tx: ConnectionCommandSender,
|
|
broadcast_connections: BroadcastActiveConnections,
|
|
shutdown: TaskClient,
|
|
) -> (Self, ControllerSender) {
|
|
let (sender, receiver) = mpsc::unbounded();
|
|
(
|
|
Controller {
|
|
active_connections: HashMap::new(),
|
|
receiver,
|
|
recently_closed: HashSet::new(),
|
|
client_connection_tx,
|
|
broadcast_connections,
|
|
pending_messages: HashMap::new(),
|
|
shutdown,
|
|
},
|
|
sender,
|
|
)
|
|
}
|
|
|
|
fn insert_connection(&mut self, conn_id: ConnectionId, connection_sender: ConnectionSender) {
|
|
let active_connection = ActiveConnection {
|
|
is_closed: false,
|
|
connection_sender: Some(connection_sender),
|
|
ordered_buffer: OrderedMessageBuffer::new(),
|
|
closed_at_index: None,
|
|
};
|
|
if let Some(_active_conn) = self.active_connections.insert(conn_id, active_connection) {
|
|
error!("Received a duplicate 'Connect'!")
|
|
} else {
|
|
// check if there were any pending messages
|
|
if let Some(pending) = self.pending_messages.remove(&conn_id) {
|
|
debug!("There were some pending messages for {}", conn_id);
|
|
for (payload, is_closed) in pending {
|
|
self.send_to_connection(conn_id, payload, is_closed)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn remove_connection(&mut self, conn_id: ConnectionId) {
|
|
debug!("Removing {} from controller", conn_id);
|
|
if self.active_connections.remove(&conn_id).is_none() {
|
|
error!(
|
|
"tried to remove non-existing connection with id: {:?}",
|
|
conn_id
|
|
)
|
|
}
|
|
self.recently_closed.insert(conn_id);
|
|
|
|
// Announce closed connections, currently used by the `OutQueueControl`.
|
|
if let Err(err) = self
|
|
.client_connection_tx
|
|
.unbounded_send(ConnectionCommand::Close(conn_id))
|
|
{
|
|
if self.shutdown.is_shutdown_poll() {
|
|
log::debug!("Failed to send: {err}");
|
|
} else {
|
|
log::error!("Failed to send: {err}");
|
|
}
|
|
}
|
|
}
|
|
|
|
fn broadcast_active_connections(&mut self) {
|
|
// What about the recently closed ones? Hopefully we can ignore them ...
|
|
let conn_ids = self.active_connections.keys().copied().collect();
|
|
|
|
self.client_connection_tx
|
|
.unbounded_send(ConnectionCommand::ActiveConnections(conn_ids))
|
|
.unwrap();
|
|
}
|
|
|
|
fn send_to_connection(&mut self, conn_id: ConnectionId, payload: Vec<u8>, is_closed: bool) {
|
|
if let Some(active_connection) = self.active_connections.get_mut(&conn_id) {
|
|
if !payload.is_empty() {
|
|
active_connection.write_to_buf(payload, is_closed);
|
|
} else if !is_closed {
|
|
error!("Tried to write an empty message to a not-closing connection. Please let us know if you see this message");
|
|
}
|
|
|
|
if let Some(payload) = active_connection.read_from_buf() {
|
|
if let Some(closed_at_index) = active_connection.closed_at_index {
|
|
if payload.last_index > closed_at_index {
|
|
active_connection.is_closed = true;
|
|
}
|
|
}
|
|
if let Err(err) = active_connection
|
|
.connection_sender
|
|
.as_mut()
|
|
.unwrap()
|
|
.unbounded_send(ConnectionMessage {
|
|
payload: payload.data,
|
|
socket_closed: active_connection.is_closed,
|
|
})
|
|
{
|
|
error!("WTF IS THIS: {err}");
|
|
}
|
|
|
|
// TODO: ABOVE UNWRAP CAUSED A CRASH IN A NORMAL USE!!!!
|
|
// TODO:
|
|
// TODO: surprisingly it only happened on socks client, never on nSP
|
|
// TODO:
|
|
// TODO:
|
|
// TODO:
|
|
// TODO:
|
|
}
|
|
} else if !self.recently_closed.contains(&conn_id) {
|
|
debug!("Received a 'Send' before 'Connect' - going to buffer the data");
|
|
let pending = self
|
|
.pending_messages
|
|
.entry(conn_id)
|
|
.or_insert_with(Vec::new);
|
|
pending.push((payload, is_closed));
|
|
} else if !is_closed {
|
|
error!(
|
|
"Tried to write to closed connection {} ({} bytes were 'lost)",
|
|
conn_id,
|
|
payload.len()
|
|
);
|
|
} else {
|
|
debug!(
|
|
"Tried to write to closed connection {}, but remote is already closed",
|
|
conn_id
|
|
)
|
|
}
|
|
}
|
|
|
|
pub async fn run(&mut self) {
|
|
let mut interval = time::interval(Duration::from_millis(500));
|
|
|
|
loop {
|
|
tokio::select! {
|
|
command = self.receiver.next() => match command {
|
|
Some(ControllerCommand::Send{connection_id, data, is_closed}) => {
|
|
self.send_to_connection(connection_id, data, is_closed)
|
|
}
|
|
Some(ControllerCommand::Insert{connection_id, connection_sender}) => {
|
|
self.insert_connection(connection_id, connection_sender)
|
|
}
|
|
Some(ControllerCommand::Remove{ connection_id }) => self.remove_connection(connection_id),
|
|
None => {
|
|
log::trace!("SOCKS5 Controller: Stopping since channel closed");
|
|
break;
|
|
}
|
|
},
|
|
_ = interval.tick() => {
|
|
if self.broadcast_connections == BroadcastActiveConnections::On {
|
|
self.broadcast_active_connections();
|
|
}
|
|
},
|
|
}
|
|
}
|
|
self.shutdown.recv_timeout().await;
|
|
log::debug!("SOCKS5 Controller: Exiting");
|
|
}
|
|
}
|