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>
105 lines
4.2 KiB
Rust
105 lines
4.2 KiB
Rust
// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
// JS: I personally don't like this name very much, but could not think of anything better.
|
|
// I will gladly take any suggestions on how to rename this.
|
|
|
|
use crate::error::GatewayClientError;
|
|
use futures::channel::mpsc;
|
|
use log::*;
|
|
use nymsphinx::addressing::nodes::MAX_NODE_ADDRESS_UNPADDED_LEN;
|
|
use nymsphinx::params::packet_sizes::PacketSize;
|
|
use task::ShutdownListener;
|
|
|
|
pub type MixnetMessageSender = mpsc::UnboundedSender<Vec<Vec<u8>>>;
|
|
pub type MixnetMessageReceiver = mpsc::UnboundedReceiver<Vec<Vec<u8>>>;
|
|
|
|
pub type AcknowledgementSender = mpsc::UnboundedSender<Vec<Vec<u8>>>;
|
|
pub type AcknowledgementReceiver = mpsc::UnboundedReceiver<Vec<Vec<u8>>>;
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub struct PacketRouter {
|
|
ack_sender: AcknowledgementSender,
|
|
mixnet_message_sender: MixnetMessageSender,
|
|
shutdown: ShutdownListener,
|
|
}
|
|
|
|
impl PacketRouter {
|
|
pub fn new(
|
|
ack_sender: AcknowledgementSender,
|
|
mixnet_message_sender: MixnetMessageSender,
|
|
shutdown: ShutdownListener,
|
|
) -> Self {
|
|
PacketRouter {
|
|
ack_sender,
|
|
mixnet_message_sender,
|
|
shutdown,
|
|
}
|
|
}
|
|
|
|
pub fn route_received(
|
|
&mut self,
|
|
unwrapped_packets: Vec<Vec<u8>>,
|
|
) -> Result<(), GatewayClientError> {
|
|
let mut received_messages = Vec::new();
|
|
let mut received_acks = Vec::new();
|
|
|
|
// remember: gateway removes final layer of sphinx encryption and from the unwrapped
|
|
// data he takes the SURB-ACK and first hop address.
|
|
// currently SURB-ACKs are attached in EVERY packet, even cover, so this is always true
|
|
let ack_overhead = PacketSize::AckPacket.size() + MAX_NODE_ADDRESS_UNPADDED_LEN;
|
|
|
|
for received_packet in unwrapped_packets {
|
|
if received_packet.len() == PacketSize::AckPacket.plaintext_size() {
|
|
received_acks.push(received_packet);
|
|
} else if received_packet.len()
|
|
== PacketSize::RegularPacket.plaintext_size() - ack_overhead
|
|
{
|
|
trace!("routing regular packet");
|
|
received_messages.push(received_packet);
|
|
} else if received_packet.len()
|
|
== PacketSize::ExtendedPacket8.plaintext_size() - ack_overhead
|
|
{
|
|
trace!("routing extended8 packet");
|
|
received_messages.push(received_packet);
|
|
} else if received_packet.len()
|
|
== PacketSize::ExtendedPacket16.plaintext_size() - ack_overhead
|
|
{
|
|
trace!("routing extended16 packet");
|
|
received_messages.push(received_packet);
|
|
} else if received_packet.len()
|
|
== PacketSize::ExtendedPacket32.plaintext_size() - ack_overhead
|
|
{
|
|
trace!("routing extended32 packet");
|
|
received_messages.push(received_packet);
|
|
} else {
|
|
// this can happen if other clients are not padding their messages
|
|
warn!("Received message of unexpected size. Probably from an outdated client... len: {}", received_packet.len());
|
|
received_messages.push(received_packet);
|
|
}
|
|
}
|
|
|
|
if !received_messages.is_empty() {
|
|
trace!("routing 'real'");
|
|
if let Err(err) = self.mixnet_message_sender.unbounded_send(received_messages) {
|
|
if self.shutdown.is_shutdown_poll() || self.shutdown.is_dummy() {
|
|
// This should ideally not happen, but it's ok
|
|
log::warn!("Failed to send mixnet message due to receiver task shutdown");
|
|
return Err(GatewayClientError::MixnetMsgSenderFailedToSend);
|
|
}
|
|
// This should never happen during ordinary operation the way it's currently used.
|
|
// Abort to be on the safe side
|
|
panic!("Failed to send mixnet message: {:?}", err);
|
|
}
|
|
}
|
|
|
|
if !received_acks.is_empty() {
|
|
trace!("routing acks");
|
|
if let Err(e) = self.ack_sender.unbounded_send(received_acks) {
|
|
error!("failed to send ack: {:?}", e);
|
|
};
|
|
}
|
|
Ok(())
|
|
}
|
|
}
|