4578cda0ae
* Network-requester: throttle inbound connections (#1789) * Return and handle ClientRequest::LaneQueueLenghts * Pass lane queue lengths to inbound future * Remove unused self reference * Request lane queue lengths periodically for all open connections * Add timeouts * Rename to ConnectionCommandSender and Receiver * Rename to client_connection_tx/rx * Fix wasm build * Replace bool with enum * rust: bump required version to 1.65 in some crates that need it * Add step to release GH actions (#1792) * feat: add a release step to nym contracts GH action * feat: add shrinking the size of wasm * Possibilty to change gateway ws listener (#1779) * add: set gatewayListener * Update types.ts * Update worker.ts * Update contracts-build.yml * real_traffic_stream: reduce frequency of status print (#1794) * Update wallet and connect lock files (#1793) * client-core: add warning when delay multiplier is larger than 1 * Fix decrypting stored received msg (#1786) * Fix decrypting stored received msg * rustfmt * Moving binary message recovery to separate function Co-authored-by: Jędrzej Stuczyński <jedrzej.stuczynski@gmail.com> * Feature/use expect instead of panicking (#1797) * Implementation of 'Debug' on 'RealMessage' * expect with failed channel name instead of throwing empty panics * Introduced Debug trait constraint in ProxyRunner * Derive Debug for socks5_requests::Message * Make connection_id optional in ClientRequest::Send (#1798) * changelog: add missing entry for fixing message decrypt in gateway-client * websocket-requests: fix length check before deserialize (#1799) * Fix export dkg contract addr (#1800) * Export dkg contract for mainnet when no config file present * Remove redundant env files * nym-cli: improve error reporting/handling and changed `vesting-schedule` queries to use query client instead of signing client * Feature/gateway client protocol version (#1795) * Introducing concept of gateway protocol version * Remove version-based gateway filtering * Fixed the unit test * grammar * Set build on latest release on schedule event * Added nightly build workflow on second latest release * socks5: if any task panics, signal all other tasks to shutdown (#1805) * socks5: signal shutdown on error * Mark as success * Tidy * Reduce wait to 5 sec * Replace unwrap with expect * Two more unwraps * Update changelog * client-core: less frequent status logging (#1806) * Feature/nym connect UI updates (#1784) * create custom titlebar * create help page * create generic modal component * create separate connection time component * link to shipyard docs * move timer to separate component and update connection status component usage * use separate component for copying ip and port details * only show infomodal once after connection * set service provider on tauri side * Emit events when stopped * listen and unlisten for tauri events * connect: add trace log to get_services * Add back CI notifications * Update README Co-authored-by: Jon Häggblad <jon.haggblad@gmail.com> Co-authored-by: Mark Sinclair <14054343+mmsinclair@users.noreply.github.com> * Use default serde value for upgrade (#1807) * fix ui overflow bug (#1808) * update nym connect error text (#1809) * set flag to false * Fix wait_for_signal_and_error on win (#1811) * Add socks5-client changes to nym-connect changelog * Fix links in nym-connect changelog * More entries in nym-connect CHANGELOG * Fix typo in changelog * Update CHANGELOG.md * Experiment/client refactoring (#1814) * experimenting with extracting more common client code * drying up the wasm client * allowing some dead code for the time being * fixed formatting in nym-connect * made socks5 client inside nym-connect immutable * made clippy a bit happier * hidden away target locking for recv timeout * New transactions for increasing amount of pledged tokens * unit tests * Added an option to pledge extra tokens through the vesting contract * Introduced wallet endpoints for new operations * Using updated pledge cap in the vesting contract * Bumping version numbers * Changelog for v1.1.1 * Bumping final version numbers for 1.1.1 * Bumping nym-cli version, missed it last time * socks5-client: SOCKS4a support (#1822) * socks5-client: SOCKS4a support * Tidy * Fix a few errors in socks5 client and network-requester (#1823) * Fix two unwraps in socks5 and network-requester * Make sure client task never sends shutdown signal * Fix panic on getting socks version * wip * connecting to the back and making the requests work * display details modal * logs removal * Feature/pledge more (#1679) * New transactions for increasing amount of pledged tokens * unit tests * Added an option to pledge extra tokens through the vesting contract * Introduced wallet endpoints for new operations * Using updated pledge cap in the vesting contract * Changelog update * nym-connect: update lock file * avoid mix tokens pools * amount error * envs/mainnet: update to latest mixnet contract and nymd validator url * validator-api: add missing shortform for --config-env-file (#1830) * gateway-client: handle shutdown listener (#1829) * WIP * WIP: try another approach * WIP * Reworked * Tidy * fix * validator-api: remove storage dependency in contract cache (#1685) * validator-api: remove storage dependency in contract cache * validator-client: update detailed routes * contract_cache: forward to new endpoints for compat * Move reward_estimate * client: add --no-cover and update --fastmode (#1831) * adding a oversaturaded bonding more modal * common/task: extract out spawn_with_report_error (#1837) * stop panic on failed buffer request * Compilable wasm client * Enabled hard error on lack of gateway-client protocol version * Missing generic parameter for ClientCoreError in BackendError * Removed unused imports * Additional wasm feature locking Co-authored-by: Jon Häggblad <jon.haggblad@gmail.com> Co-authored-by: Fran Arbanas <arbanasfran@gmail.com> Co-authored-by: cgi-bin/ <6095048+sven-hash@users.noreply.github.com> Co-authored-by: Mark Sinclair <14054343+mmsinclair@users.noreply.github.com> Co-authored-by: Bogdan-Ștefan Neacşu <bogdan@nymtech.net> Co-authored-by: Mark Sinclair <mmsinclair@users.noreply.github.com> Co-authored-by: Raphaël Walther <raphael@nymtech.net> Co-authored-by: Fouad <fmtabbara@hotmail.co.uk> Co-authored-by: Gala <calero.vg@gmail.com> Co-authored-by: Dave Hrycyszyn <futurechimp@users.noreply.github.com>
125 lines
4.4 KiB
Rust
125 lines
4.4 KiB
Rust
use crate::error::Socks5ClientError;
|
|
|
|
use super::{
|
|
authentication::Authenticator, client::SocksClient, mixnet_responses::MixnetResponseListener,
|
|
};
|
|
use crate::socks::client;
|
|
use client_connections::{ConnectionCommandSender, LaneQueueLengths};
|
|
use client_core::client::{
|
|
inbound_messages::InputMessageSender, received_buffer::ReceivedBufferRequestSender,
|
|
};
|
|
use log::*;
|
|
use nymsphinx::addressing::clients::Recipient;
|
|
use proxy_helpers::connection_controller::{BroadcastActiveConnections, Controller};
|
|
use std::net::SocketAddr;
|
|
use tap::TapFallible;
|
|
use task::ShutdownListener;
|
|
use tokio::net::TcpListener;
|
|
|
|
/// A Socks5 server that listens for connections.
|
|
pub struct SphinxSocksServer {
|
|
authenticator: Authenticator,
|
|
listening_address: SocketAddr,
|
|
service_provider: Recipient,
|
|
self_address: Recipient,
|
|
client_config: client::Config,
|
|
lane_queue_lengths: LaneQueueLengths,
|
|
shutdown: ShutdownListener,
|
|
}
|
|
|
|
impl SphinxSocksServer {
|
|
/// Create a new SphinxSocks instance
|
|
pub(crate) fn new(
|
|
port: u16,
|
|
authenticator: Authenticator,
|
|
service_provider: Recipient,
|
|
self_address: Recipient,
|
|
lane_queue_lengths: LaneQueueLengths,
|
|
client_config: client::Config,
|
|
shutdown: ShutdownListener,
|
|
) -> Self {
|
|
// hardcode ip as we (presumably) ONLY want to listen locally. If we change it, we can
|
|
// just modify the config
|
|
let ip = "127.0.0.1";
|
|
info!("Listening on {}:{}", ip, port);
|
|
SphinxSocksServer {
|
|
authenticator,
|
|
listening_address: format!("{}:{}", ip, port).parse().unwrap(),
|
|
service_provider,
|
|
self_address,
|
|
client_config,
|
|
lane_queue_lengths,
|
|
shutdown,
|
|
}
|
|
}
|
|
|
|
/// Set up the listener and initiate connection handling when something
|
|
/// connects to the server.
|
|
pub(crate) async fn serve(
|
|
&mut self,
|
|
input_sender: InputMessageSender,
|
|
buffer_requester: ReceivedBufferRequestSender,
|
|
client_connection_tx: ConnectionCommandSender,
|
|
) -> Result<(), Socks5ClientError> {
|
|
let listener = TcpListener::bind(self.listening_address)
|
|
.await
|
|
.tap_err(|err| log::error!("Failed to bind to address: {err}"))?;
|
|
info!("Serving Connections...");
|
|
|
|
// controller for managing all active connections
|
|
let (mut active_streams_controller, controller_sender) = Controller::new(
|
|
client_connection_tx,
|
|
BroadcastActiveConnections::Off,
|
|
self.shutdown.clone(),
|
|
);
|
|
tokio::spawn(async move {
|
|
active_streams_controller.run().await;
|
|
});
|
|
|
|
// listener for mix messages
|
|
let mut mixnet_response_listener = MixnetResponseListener::new(
|
|
buffer_requester,
|
|
controller_sender.clone(),
|
|
self.shutdown.clone(),
|
|
);
|
|
tokio::spawn(async move {
|
|
mixnet_response_listener.run().await;
|
|
});
|
|
|
|
loop {
|
|
tokio::select! {
|
|
Ok((stream, _remote)) = listener.accept() => {
|
|
let mut client = SocksClient::new(
|
|
self.client_config,
|
|
stream,
|
|
self.authenticator.clone(),
|
|
input_sender.clone(),
|
|
&self.service_provider,
|
|
controller_sender.clone(),
|
|
&self.self_address,
|
|
self.lane_queue_lengths.clone(),
|
|
self.shutdown.clone(),
|
|
);
|
|
|
|
tokio::spawn(async move {
|
|
if let Err(err) = client.run().await {
|
|
error!("Error! {}", err);
|
|
if client.send_error(err).await.is_err() {
|
|
warn!("Failed to send error code");
|
|
};
|
|
if client.shutdown().await.is_err() {
|
|
warn!("Failed to shutdown TcpStream");
|
|
};
|
|
}
|
|
});
|
|
},
|
|
_ = self.shutdown.recv() => {
|
|
log::trace!("SphinxSocksServer: Received shutdown");
|
|
log::debug!("SphinxSocksServer: Exiting");
|
|
return Ok(());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|