a7d8613c9d
* Feature/multi surbs (#1796) * bunch of wip with focus on serialization * Being able to send normal data (NO SURBS yet) to yourself again * Fixed RepliableMessage deserialization * Recovering data from surb messages * Extracted common code in sphinx payload construction * Cleanup within received buffer * requesting, sending and using additional reply surbs * Following discussion with @simonwicky, removing sender proof and decreasing size of sender tag * Made sender tag more easily configurable * Refactoring of message creation * Propagating reply surb acks but not retransmitting them yet * Surb retransmissions * requesting additional surbs from the retransmission flow * correctly determining the point of requesting additional surbs * Ability to use socks5 (and network requester) with surbs * Improved surbs retranmsission reliability * naive way of not over-requesting surbs * wip on tag storage * Improved error propagation for message construction * Requesting more surbs for stale entries * Better controlling the point of having to request additional surbs * Using pseudorandom sender tag instead of a hardcoded one * First cleanup round in MessageHandler * Error cleanup and if simplification * Assigned a more permanent name to the ReplyController * Removed PendingReply redundant type * Made socks5 client less eager to over-send reply surbs * 'anonymous' field on socks5 client to decide whether to use surbs or attach address * Dead code and import removal in client-core * Updating ClientRequest variants * Adjusted decision threshold for requesting more surbs * Native client cleanup * Made socks5 client usage of surbs configurable * Restored statistics in network requester * Validator-api compiles once again * Further improved surb request logic * boxing the recipient in controller requests * Removal of hardcoded values in favour of propagating them from the config * more validation during surb requests * Fixed ClientRequest::Send deserialization * Added length checks for request deserialization * post-merge formatting * Unit tests once again compile and pass * controlling retransmission_reply_surb_request_size from config * More Recipient boxing action * Requesting additional reply surbs for retransmission BEFORE dipping below the threshold * Making clippy generally happier * Wasm client compiles (but might not yet work correctly) * 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 * 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> * real_traffic_stream: reduce frequency of status print (#1794) * Properly defined unnamed errors * Dealing with previously ignored errors * logging improvements * Removed old example code Co-authored-by: Jon Häggblad <jon.haggblad@gmail.com> * Missing changelog entry for multi-surbs (#1802) * Making anonymous sender tag human readable (#1801) * Created wrapper with string serialization for AnonymousSenderTag * Using Display implementation of AnonymousSenderTag for logs * Using Display implementation of MessageRecoveryError when logging (#1803) * Using Display implementation of MessageRecoveryError when logging * Updated changelog * Defined socks5 client startup flag to enable reply-surb communication (#1804) * Feature/persistent surbs data (#1835) * prototyping wip * Implemented ReplyStorageBackend trait for the sql-backed storage * Storing correct surb threshold * using correct database path * Starting surb persistent storage in native and socks5 clients * loading or creating fresh surb storage in socks5 and native clients * making clippy happier + fixing config templates * Creating status table on database rotation * Completed the 'Empty' ReplyStorageBackend * feature locking wasm-incompatible bits and pieces * Feature/develop resync (#1844) * 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> * Making native client wait for shutdown * Marking dead test code * Feature/multi surbs invalidation (#1858) * Cleaned up RealMessagesController constructor * introduced config field for maximum_reply_surb_age * Handling edge-case reply-surb failures * invalidating old reply surbs * Removing old reply keys from cache * Invalidating old reply keys * missing config changes * logging created tag details * Fixed clippy warning in test code * Saving reply key timestamp on data flush (#1867) * Remove panic if ReconstructedMessagesReceiver is closed (#1868) Instead log error and return because presumably the shutdown procedure has started * Feature/multi surbs basic wasm interface (#1846) * Added builder to wasm client * missing wasm_bindgen macros * Added constructor macro on GatewayEndpointConfig * Attempting to use updated wasm client api * Removing dead code * Exposed other messages types in wasm client * cleanup in js-example * Changed 'self_address' to be a method call * Removed needless borrow when cloning an Arc * Improving arguments in 'on_message' callback * fixed wasm-client dependency/features * Reverted hard requirement for gateway protocol presence (#1875) * Feature/prioritise surb retransmission (#1883) * Improved error messages + removed redundant variants * Improved estimation of 'expected_forward_delay' * Removed old wasm-specific startup code * Removed old unused reply-related code * hacky and temporary way of buffering retransmission data * offloading retransmission reply handling to ReplyController * fixed linter errors + rebuffering retransmission data on failure * Removed unused fields from wasm client debug config * Chore/v1.2.0 update (#2666) * 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 * feat(wallet): buy page bootstrap * feat(wallet-buy): tutorial * feat(explorer-api): add route to fetch nym terms&cdts * Revert "feat(explorer-api): add route to fetch nym terms&cdts" This reverts commit 876f752697d89061b1904e1ddd1d5bcb7045dc5c. * feat(wallet-buy-nym): buy page new ui * fix(wallet-buy-nym): signature output * feat(wallet-buy-nym): update signature modal ui * 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) * feat(wallet): add link to nym exchange interface * update nym connect error text (#1809) * refactor(wallet): clean code * set flag to false * Fix wait_for_signal_and_error on win (#1811) * Use config URLs in clients before the env values (#1813) * 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 * Feature/dkg integration tests (#1815) * DKG contract e2e test * Refactor to the same format as other contracts * Vk share tests * State tests * Dealings tests * Dealer tests * Api dkg tests * Fix path to contract after refactor * Fix test target clippy * 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 * 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 * Fix a few errors in socks5 client and network-requester (backport) (#1824) * Fix two unwraps in socks5 and network-requester * Make sure client task never sends shutdown signal * nym-connect: update lock file * fix(wallet): typo * avoid mix tokens pools * fix(wallet): typo * fix(wallet): buy tutorial ui responsivness * 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 * Node family management (#1670) * Family management messages * Add family queries * Add queries to client * Layer assignment message * Paged family queries, annotate mixnodes with family * Add layer assignments to epoch operations * Remove family layer peristence * Add NotImplemented error for kick Co-authored-by: Jędrzej Stuczyński <jedrzej.stuczynski@gmail.com> * Fixed layer distribution skewness check (#1766) * client: add --no-cover and update --fastmode (#1831) * adding a oversaturaded bonding more modal * Use better naming on gateway credential handling (#1834) * Fix comment in configuration file (#1836) * common/task: extract out spawn_with_report_error (#1837) * nym-connect/changelog: add note about disconnect fix * Feature/simplify credential binary (#1841) * Expose name of standard directories * Use one command instead of two * nym-connect: append error to failed message (#1839) * nym-connect: append error to failed message * changelog: add note * Fix clippy * remove extra checks to display vesting schedule(#1826) * Set explorer to use rpc.nymtech.net * update versions for platfrom, nym-connect and nym-wallet to v1.1.2 * changed nym-connect version to 1.1.1 * Modifying changelog for v1.1.2 * changed nym-connect version to 1.1.2 * update nym-connect CHANGELOG * Updated changelog for wallet * Feature/wallet content updates (#1825) * fix up balance screen * fix up app bar and nym logo alignment * fix up delegation action icon font weight * fix up bond page * Corrected env variable name in workflows * Use config URLs in clients before the env values (#1813) * Feature/dkg integration tests (#1815) * DKG contract e2e test * Refactor to the same format as other contracts * Vk share tests * State tests * Dealings tests * Dealer tests * Api dkg tests * Fix path to contract after refactor * Fix test target clippy * Node family management (#1670) * Family management messages * Add family queries * Add queries to client * Layer assignment message * Paged family queries, annotate mixnodes with family * Add layer assignments to epoch operations * Remove family layer peristence * Add NotImplemented error for kick Co-authored-by: Jędrzej Stuczyński <jedrzej.stuczynski@gmail.com> * Fixed layer distribution skewness check (#1766) * Use better naming on gateway credential handling (#1834) * Fix comment in configuration file (#1836) * nym-connect/changelog: add note about disconnect fix * Feature/simplify credential binary (#1841) * Expose name of standard directories * Use one command instead of two * Fix clippy * feat(wallet): buy page bootstrap * feat(wallet-buy): tutorial * feat(explorer-api): add route to fetch nym terms&cdts * Revert "feat(explorer-api): add route to fetch nym terms&cdts" This reverts commit 876f752697d89061b1904e1ddd1d5bcb7045dc5c. * feat(wallet-buy-nym): buy page new ui * fix(wallet-buy-nym): signature output * feat(wallet-buy-nym): update signature modal ui * feat(wallet): add link to nym exchange interface * refactor(wallet): clean code * fix(wallet): typo * fix(wallet): typo * fix(wallet): buy tutorial ui responsivness * update versions for platfrom, nym-connect and nym-wallet to v1.1.2 * changed nym-connect version to 1.1.1 * Modifying changelog for v1.1.2 * changed nym-connect version to 1.1.2 * update nym-connect CHANGELOG * Updated changelog for wallet * Resolve merge conflicts * Update qa-qwerty.env * Fixed URL to branch * changed ubuntu-latest on GH actions to ubuntu-20.04 * docs: updated changelog for contracts release v1.1.2 and updated versions of mixnet and vesting contracts as well * Add ignore to dkg expensive tests (#1856) * introduce minimize button in custom title bar (#1843) * refresh balance after sending tokens (#1857) * Feature/fix client multi cred consume (#1859) * Mark consumed credentials in the db * Add signature log * Fix wasm mock Storage trait * Fix clippy * Feature/verify bte proof (#1866) * Update lock file * Include bte public key verification * Wallet - Buy, copy changes (#1855) * use mix_id for account to get correct pending cost event (#1869) * use mix_id for account to get correct pending cost event * Properly add consumed to table (#1870) * nym-connect: update Cargo.lock to 1.1.2 * Clients: save init results to JSON (#1865) * clients: output results of init to json * Remove leftover dbg * Tidy * Fix nym-connect * Client: dedup setup gateway during init (#1871) * clients: dedup gateway setup logic * nym-connect: extract out print_save_config * Feature/dkg state to disk (#1872) * Add PersistentState * Save and load state to/from disk * If in progress, don't continually write the same state * Fix tests and add serde one * Update changelog * Fix clippy * network-requester: return error on socket close (#1876) * network-requester: return error when the socket closes * changelog: add note * clients: further deduplicate init code (#1873) * client-core: move init helpers to module * WIP * socks5: return error instead of terminate in init * Extract out reuse_existing_gateway_config * rustfmt * Remove comment out code * nym-connect: use setup_gateway * Linebreak * changelog: update * Tweak log * rustfmt * client: pick from old lanes probabilisticlly (#1877) * Pick from old lanes probabilisticly * changelog: update * clients: dont panic in base client gateway client handling (#1878) * client-core: fix some panics related to gateway-client * changelog: update * fix * changelog: fix wording * Use default mainnet values when nothing is specified (#1884) 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: pierre <dommerc.pierre@gmail.com> 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> Co-authored-by: Drazen Urch <drazen@urch.eu> Co-authored-by: durch <durch@users.noreply.github.com> Co-authored-by: Tommy Verrall <60836166+tommyv1987@users.noreply.github.com> 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> Co-authored-by: pierre <dommerc.pierre@gmail.com> Co-authored-by: Drazen Urch <drazen@urch.eu> Co-authored-by: durch <durch@users.noreply.github.com> Co-authored-by: Tommy Verrall <60836166+tommyv1987@users.noreply.github.com>
569 lines
21 KiB
Rust
569 lines
21 KiB
Rust
// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
// all variable size data is always prefixed with u64 length
|
|
// tags are u8
|
|
|
|
use crate::error::{self, ErrorKind};
|
|
use crate::text::ClientRequestText;
|
|
use nymsphinx::addressing::clients::Recipient;
|
|
use nymsphinx::anonymous_replies::requests::{AnonymousSenderTag, SENDER_TAG_SIZE};
|
|
use std::convert::{TryFrom, TryInto};
|
|
use std::mem::size_of;
|
|
|
|
#[repr(u8)]
|
|
enum ClientRequestTag {
|
|
/// Value tag representing [`Send`] variant of the [`ClientRequest`]
|
|
Send = 0x00,
|
|
|
|
/// Value tag representing [`SendAnonymous`] variant of the [`ClientRequest`]
|
|
SendAnonymous = 0x01,
|
|
|
|
/// Value tag representing [`Reply`] variant of the [`ClientRequest`]
|
|
Reply = 0x02,
|
|
|
|
/// Value tag representing [`SelfAddress`] variant of the [`ClientRequest`]
|
|
SelfAddress = 0x03,
|
|
|
|
/// Value tag representing [`ClosedConnection`] variant of the [`ClientRequest`]
|
|
ClosedConnection = 0x04,
|
|
|
|
/// Value tag representing [`GetLaneQueueLength`] variant of the [`ClientRequest`]
|
|
GetLaneQueueLength = 0x05,
|
|
}
|
|
|
|
impl TryFrom<u8> for ClientRequestTag {
|
|
type Error = error::Error;
|
|
|
|
fn try_from(value: u8) -> Result<Self, Self::Error> {
|
|
match value {
|
|
_ if value == (Self::Send as u8) => Ok(Self::Send),
|
|
_ if value == (Self::SendAnonymous as u8) => Ok(Self::SendAnonymous),
|
|
_ if value == (Self::Reply as u8) => Ok(Self::Reply),
|
|
_ if value == (Self::SelfAddress as u8) => Ok(Self::SelfAddress),
|
|
_ if value == (Self::ClosedConnection as u8) => Ok(Self::ClosedConnection),
|
|
_ if value == (Self::GetLaneQueueLength as u8) => Ok(Self::GetLaneQueueLength),
|
|
n => Err(error::Error::new(
|
|
ErrorKind::UnknownRequest,
|
|
format!("{n} does not correspond to any valid request tag"),
|
|
)),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[allow(non_snake_case)]
|
|
#[derive(Debug)]
|
|
pub enum ClientRequest {
|
|
/// The simplest message variant where no additional information is attached.
|
|
/// You're simply sending your `data` to specified `recipient` without any tagging.
|
|
///
|
|
/// Ends up with `NymMessage::Plain` variant
|
|
Send {
|
|
recipient: Recipient,
|
|
message: Vec<u8>,
|
|
connection_id: Option<u64>,
|
|
},
|
|
|
|
/// Create a message used for a duplex anonymous communication where the recipient
|
|
/// will never learn of our true identity. This is achieved by carefully sending `reply_surbs`.
|
|
///
|
|
/// Note that if reply_surbs is set to zero then
|
|
/// this variant requires the client having sent some reply_surbs in the past
|
|
/// (and thus the recipient also knowing our sender tag).
|
|
///
|
|
/// Ends up with `NymMessage::Repliable` variant
|
|
SendAnonymous {
|
|
recipient: Recipient,
|
|
message: Vec<u8>,
|
|
reply_surbs: u32,
|
|
connection_id: Option<u64>,
|
|
},
|
|
|
|
/// Attempt to use our internally received and stored `ReplySurb` to send the message back
|
|
/// to specified recipient whilst not knowing its full identity (or even gateway).
|
|
///
|
|
/// Ends up with `NymMessage::Reply` variant
|
|
Reply {
|
|
sender_tag: AnonymousSenderTag,
|
|
message: Vec<u8>,
|
|
connection_id: Option<u64>,
|
|
},
|
|
|
|
SelfAddress,
|
|
|
|
ClosedConnection(u64),
|
|
|
|
GetLaneQueueLength(u64),
|
|
}
|
|
|
|
// we could have been parsing it directly TryFrom<WsMessage>, but we want to retain
|
|
// information about whether it came from binary or text to send appropriate response back
|
|
impl ClientRequest {
|
|
// SEND_REQUEST_TAG || recipient || conn_id || data_len || data
|
|
fn serialize_send(recipient: Recipient, data: Vec<u8>, connection_id: Option<u64>) -> Vec<u8> {
|
|
let data_len_bytes = (data.len() as u64).to_be_bytes();
|
|
let conn_id_bytes = connection_id.unwrap_or(0).to_be_bytes();
|
|
|
|
std::iter::once(ClientRequestTag::Send as u8)
|
|
.chain(recipient.to_bytes().into_iter()) // will not be length prefixed because the length is constant
|
|
.chain(conn_id_bytes.into_iter())
|
|
.chain(data_len_bytes.into_iter())
|
|
.chain(data.into_iter())
|
|
.collect()
|
|
}
|
|
|
|
// SEND_REQUEST_TAG || recipient || conn_id || data_len || data
|
|
fn deserialize_send(b: &[u8]) -> Result<Self, error::Error> {
|
|
// we need to have at least 1 (tag) + Recipient::LEN + 2*sizeof<u64> bytes
|
|
if b.len() < 1 + Recipient::LEN + 2 * size_of::<u64>() {
|
|
return Err(error::Error::new(
|
|
ErrorKind::TooShortRequest,
|
|
"not enough data provided to recover 'send'".to_string(),
|
|
));
|
|
}
|
|
|
|
// this MUST match because it was called by 'deserialize'
|
|
debug_assert_eq!(b[0], ClientRequestTag::Send as u8);
|
|
|
|
let mut recipient_bytes = [0u8; Recipient::LEN];
|
|
recipient_bytes.copy_from_slice(&b[1..1 + Recipient::LEN]);
|
|
let recipient = match Recipient::try_from_bytes(recipient_bytes) {
|
|
Ok(recipient) => recipient,
|
|
Err(err) => {
|
|
return Err(error::Error::new(
|
|
ErrorKind::MalformedRequest,
|
|
format!("malformed recipient: {:?}", err),
|
|
))
|
|
}
|
|
};
|
|
|
|
let mut connection_id_bytes = [0u8; size_of::<u64>()];
|
|
connection_id_bytes
|
|
.copy_from_slice(&b[1 + Recipient::LEN..1 + Recipient::LEN + size_of::<u64>()]);
|
|
let connection_id = u64::from_be_bytes(connection_id_bytes);
|
|
let connection_id = if connection_id == 0 {
|
|
None
|
|
} else {
|
|
Some(connection_id)
|
|
};
|
|
|
|
let data_len_bytes =
|
|
&b[1 + Recipient::LEN + size_of::<u64>()..1 + Recipient::LEN + 2 * size_of::<u64>()];
|
|
let data_len = u64::from_be_bytes(data_len_bytes.try_into().unwrap());
|
|
let data = &b[1 + Recipient::LEN + 2 * size_of::<u64>()..];
|
|
if data.len() as u64 != data_len {
|
|
return Err(error::Error::new(
|
|
ErrorKind::MalformedRequest,
|
|
format!(
|
|
"data len has inconsistent length. specified: {} got: {}",
|
|
data_len,
|
|
data.len()
|
|
),
|
|
));
|
|
}
|
|
|
|
Ok(ClientRequest::Send {
|
|
recipient,
|
|
message: data.to_vec(),
|
|
connection_id,
|
|
})
|
|
}
|
|
|
|
// SEND_ANONYMOUS_REQUEST_TAG || reply_surbs || recipient || conn_id || data_len || data
|
|
fn serialize_send_anonymous(
|
|
recipient: Recipient,
|
|
data: Vec<u8>,
|
|
reply_surbs: u32,
|
|
connection_id: Option<u64>,
|
|
) -> Vec<u8> {
|
|
let data_len_bytes = (data.len() as u64).to_be_bytes();
|
|
let conn_id_bytes = connection_id.unwrap_or(0).to_be_bytes();
|
|
|
|
std::iter::once(ClientRequestTag::SendAnonymous as u8)
|
|
.chain(reply_surbs.to_be_bytes().into_iter())
|
|
.chain(recipient.to_bytes().into_iter()) // will not be length prefixed because the length is constant
|
|
.chain(conn_id_bytes.into_iter())
|
|
.chain(data_len_bytes.into_iter())
|
|
.chain(data.into_iter())
|
|
.collect()
|
|
}
|
|
|
|
// SEND_ANONYMOUS_REQUEST_TAG || reply_surbs || recipient || data_len || data
|
|
fn deserialize_send_anonymous(b: &[u8]) -> Result<Self, error::Error> {
|
|
// we need to have at least 1 (tag) + sizeof<u32> (num surbs) + Recipient::LEN + 2 *sizeof<u64> bytes
|
|
if b.len() < 1 + size_of::<u32>() + Recipient::LEN + 2 * size_of::<u64>() {
|
|
return Err(error::Error::new(
|
|
ErrorKind::TooShortRequest,
|
|
"not enough data provided to recover 'send_anonymous'".to_string(),
|
|
));
|
|
}
|
|
|
|
// this MUST match because it was called by 'deserialize'
|
|
debug_assert_eq!(b[0], ClientRequestTag::SendAnonymous as u8);
|
|
|
|
let reply_surbs = u32::from_be_bytes([b[1], b[2], b[3], b[4]]);
|
|
|
|
let mut recipient_bytes = [0u8; Recipient::LEN];
|
|
recipient_bytes.copy_from_slice(&b[5..5 + Recipient::LEN]);
|
|
let recipient = match Recipient::try_from_bytes(recipient_bytes) {
|
|
Ok(recipient) => recipient,
|
|
Err(err) => {
|
|
return Err(error::Error::new(
|
|
ErrorKind::MalformedRequest,
|
|
format!("malformed recipient: {:?}", err),
|
|
))
|
|
}
|
|
};
|
|
|
|
let mut connection_id_bytes = [0u8; size_of::<u64>()];
|
|
connection_id_bytes
|
|
.copy_from_slice(&b[5 + Recipient::LEN..5 + Recipient::LEN + size_of::<u64>()]);
|
|
let connection_id = u64::from_be_bytes(connection_id_bytes);
|
|
let connection_id = if connection_id == 0 {
|
|
None
|
|
} else {
|
|
Some(connection_id)
|
|
};
|
|
|
|
let data_len_bytes =
|
|
&b[5 + Recipient::LEN + size_of::<u64>()..5 + Recipient::LEN + 2 * size_of::<u64>()];
|
|
let data_len = u64::from_be_bytes(data_len_bytes.try_into().unwrap());
|
|
let data = &b[5 + Recipient::LEN + 2 * size_of::<u64>()..];
|
|
if data.len() as u64 != data_len {
|
|
return Err(error::Error::new(
|
|
ErrorKind::MalformedRequest,
|
|
format!(
|
|
"data len has inconsistent length. specified: {} got: {}",
|
|
data_len,
|
|
data.len()
|
|
),
|
|
));
|
|
}
|
|
|
|
Ok(ClientRequest::SendAnonymous {
|
|
reply_surbs,
|
|
recipient,
|
|
message: data.to_vec(),
|
|
connection_id,
|
|
})
|
|
}
|
|
|
|
// REPLY_REQUEST_TAG || SENDER_TAG || conn_id || message_len || message
|
|
fn serialize_reply(
|
|
message: Vec<u8>,
|
|
sender_tag: AnonymousSenderTag,
|
|
connection_id: Option<u64>,
|
|
) -> Vec<u8> {
|
|
let message_len_bytes = (message.len() as u64).to_be_bytes();
|
|
let conn_id_bytes = connection_id.unwrap_or(0).to_be_bytes();
|
|
|
|
std::iter::once(ClientRequestTag::Reply as u8)
|
|
.chain(sender_tag.to_bytes().into_iter())
|
|
.chain(conn_id_bytes.into_iter())
|
|
.chain(message_len_bytes.into_iter())
|
|
.chain(message.into_iter())
|
|
.collect()
|
|
}
|
|
|
|
// REPLY_REQUEST_TAG || SENDER_TAG || conn_id || message_len || message
|
|
fn deserialize_reply(b: &[u8]) -> Result<Self, error::Error> {
|
|
if b.len() < 1 + SENDER_TAG_SIZE + 2 * size_of::<u64>() {
|
|
return Err(error::Error::new(
|
|
ErrorKind::TooShortRequest,
|
|
"not enough data provided to recover 'reply'".to_string(),
|
|
));
|
|
}
|
|
|
|
// this MUST match because it was called by 'deserialize'
|
|
debug_assert_eq!(b[0], ClientRequestTag::Reply as u8);
|
|
|
|
// the unwrap here is fine as we're definitely using exactly SENDER_TAG_SIZE bytes
|
|
let sender_tag =
|
|
AnonymousSenderTag::from_bytes(b[1..1 + SENDER_TAG_SIZE].try_into().unwrap());
|
|
|
|
let mut connection_id_bytes = [0u8; size_of::<u64>()];
|
|
connection_id_bytes
|
|
.copy_from_slice(&b[1 + SENDER_TAG_SIZE..1 + SENDER_TAG_SIZE + size_of::<u64>()]);
|
|
let connection_id = u64::from_be_bytes(connection_id_bytes);
|
|
let connection_id = if connection_id == 0 {
|
|
None
|
|
} else {
|
|
Some(connection_id)
|
|
};
|
|
|
|
let message_len = u64::from_be_bytes(
|
|
b[1 + SENDER_TAG_SIZE + size_of::<u64>()..1 + SENDER_TAG_SIZE + 2 * size_of::<u64>()]
|
|
.try_into()
|
|
.unwrap(),
|
|
);
|
|
let message = &b[1 + SENDER_TAG_SIZE + 2 * size_of::<u64>()..];
|
|
if message.len() as u64 != message_len {
|
|
return Err(error::Error::new(
|
|
ErrorKind::MalformedRequest,
|
|
format!(
|
|
"message len has inconsistent length. specified: {} got: {}",
|
|
message_len,
|
|
message.len()
|
|
),
|
|
));
|
|
}
|
|
|
|
Ok(ClientRequest::Reply {
|
|
message: message.to_vec(),
|
|
sender_tag,
|
|
connection_id,
|
|
})
|
|
}
|
|
|
|
// SELF_ADDRESS_REQUEST_TAG
|
|
fn serialize_self_address() -> Vec<u8> {
|
|
vec![ClientRequestTag::SelfAddress as u8]
|
|
}
|
|
|
|
// SELF_ADDRESS_REQUEST_TAG
|
|
fn deserialize_self_address(b: &[u8]) -> Result<Self, error::Error> {
|
|
// this MUST match because it was called by 'deserialize'
|
|
debug_assert_eq!(b[0], ClientRequestTag::SelfAddress as u8);
|
|
|
|
Ok(ClientRequest::SelfAddress)
|
|
}
|
|
|
|
// CLOSED_CONNECTION_REQUEST_TAG
|
|
fn serialize_closed_connection(connection_id: u64) -> Vec<u8> {
|
|
let conn_id_bytes = connection_id.to_be_bytes();
|
|
std::iter::once(ClientRequestTag::ClosedConnection as u8)
|
|
.chain(conn_id_bytes.into_iter())
|
|
.collect()
|
|
}
|
|
|
|
// CLOSED_CONNECTION_REQUEST_TAG
|
|
fn deserialize_closed_connection(b: &[u8]) -> Result<Self, error::Error> {
|
|
if b.len() != 1 + size_of::<u64>() {
|
|
return Err(error::Error::new(
|
|
ErrorKind::MalformedRequest,
|
|
"The received closed connection has invalid length",
|
|
));
|
|
}
|
|
|
|
// this MUST match because it was called by 'deserialize'
|
|
debug_assert_eq!(b[0], ClientRequestTag::ClosedConnection as u8);
|
|
|
|
let mut connection_id_bytes = [0u8; size_of::<u64>()];
|
|
connection_id_bytes.copy_from_slice(&b[1..=size_of::<u64>()]);
|
|
let connection_id = u64::from_be_bytes(connection_id_bytes);
|
|
|
|
Ok(ClientRequest::ClosedConnection(connection_id))
|
|
}
|
|
|
|
// GET_LANE_QUEUE_LENGHT_TAG
|
|
fn serialize_get_lane_queue_lengths(connection_id: u64) -> Vec<u8> {
|
|
let conn_id_bytes = connection_id.to_be_bytes();
|
|
std::iter::once(ClientRequestTag::GetLaneQueueLength as u8)
|
|
.chain(conn_id_bytes.into_iter())
|
|
.collect()
|
|
}
|
|
|
|
// GET_LANE_QUEUE_LENGHT_TAG
|
|
fn deserialize_get_lane_queue_length(b: &[u8]) -> Result<Self, error::Error> {
|
|
if b.len() != 1 + size_of::<u64>() {
|
|
return Err(error::Error::new(
|
|
ErrorKind::MalformedRequest,
|
|
"The received get lane queue lengths has invalid length",
|
|
));
|
|
}
|
|
|
|
// this MUST match because it was called by 'deserialize'
|
|
debug_assert_eq!(b[0], ClientRequestTag::GetLaneQueueLength as u8);
|
|
|
|
let mut connection_id_bytes = [0u8; size_of::<u64>()];
|
|
connection_id_bytes.copy_from_slice(&b[1..=size_of::<u64>()]);
|
|
let connection_id = u64::from_be_bytes(connection_id_bytes);
|
|
|
|
Ok(ClientRequest::GetLaneQueueLength(connection_id))
|
|
}
|
|
|
|
pub fn serialize(self) -> Vec<u8> {
|
|
match self {
|
|
ClientRequest::Send {
|
|
recipient,
|
|
message,
|
|
connection_id,
|
|
} => Self::serialize_send(recipient, message, connection_id),
|
|
|
|
ClientRequest::SendAnonymous {
|
|
recipient,
|
|
message,
|
|
reply_surbs,
|
|
connection_id,
|
|
} => Self::serialize_send_anonymous(recipient, message, reply_surbs, connection_id),
|
|
|
|
ClientRequest::Reply {
|
|
message,
|
|
sender_tag,
|
|
connection_id,
|
|
} => Self::serialize_reply(message, sender_tag, connection_id),
|
|
|
|
ClientRequest::SelfAddress => Self::serialize_self_address(),
|
|
|
|
ClientRequest::ClosedConnection(id) => Self::serialize_closed_connection(id),
|
|
|
|
ClientRequest::GetLaneQueueLength(id) => Self::serialize_get_lane_queue_lengths(id),
|
|
}
|
|
}
|
|
|
|
pub fn deserialize(b: &[u8]) -> Result<Self, error::Error> {
|
|
if b.is_empty() {
|
|
// technically I'm not even sure this can ever be returned, because reading empty
|
|
// request would imply closed socket, but let's include it for completion sake
|
|
return Err(error::Error::new(
|
|
ErrorKind::EmptyRequest,
|
|
"no data provided".to_string(),
|
|
));
|
|
}
|
|
|
|
let request_tag = ClientRequestTag::try_from(b[0])?;
|
|
|
|
// determine what kind of request that is and try to deserialize it
|
|
match request_tag {
|
|
ClientRequestTag::Send => Self::deserialize_send(b),
|
|
ClientRequestTag::SendAnonymous => Self::deserialize_send_anonymous(b),
|
|
ClientRequestTag::Reply => Self::deserialize_reply(b),
|
|
ClientRequestTag::SelfAddress => Self::deserialize_self_address(b),
|
|
ClientRequestTag::ClosedConnection => Self::deserialize_closed_connection(b),
|
|
ClientRequestTag::GetLaneQueueLength => Self::deserialize_get_lane_queue_length(b),
|
|
}
|
|
}
|
|
|
|
pub fn try_from_binary(raw_req: &[u8]) -> Result<Self, error::Error> {
|
|
Self::deserialize(raw_req)
|
|
}
|
|
|
|
pub fn try_from_text(raw_req: String) -> Result<Self, error::Error> {
|
|
// use the intermediate string structure and let serde do bunch of work for us
|
|
let text_req = ClientRequestText::try_from(raw_req).map_err(|json_err| {
|
|
error::Error::new(ErrorKind::MalformedRequest, json_err.to_string())
|
|
})?;
|
|
|
|
text_req.try_into()
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
// very basic tests to check for obvious errors like off by one
|
|
#[test]
|
|
fn send_request_serialization_works() {
|
|
let recipient = Recipient::try_from_base58_string("CytBseW6yFXUMzz4SGAKdNLGR7q3sJLLYxyBGvutNEQV.4QXYyEVc5fUDjmmi8PrHN9tdUFV4PCvSJE1278cHyvoe@4sBbL1ngf1vtNqykydQKTFh26sQCw888GpUqvPvyNB4f").unwrap();
|
|
let recipient_string = recipient.to_string();
|
|
|
|
let send_request = ClientRequest::Send {
|
|
recipient,
|
|
message: b"foomp".to_vec(),
|
|
connection_id: Some(42),
|
|
};
|
|
|
|
let bytes = send_request.serialize();
|
|
let recovered = ClientRequest::deserialize(&bytes).unwrap();
|
|
match recovered {
|
|
ClientRequest::Send {
|
|
recipient,
|
|
message,
|
|
connection_id,
|
|
} => {
|
|
assert_eq!(recipient.to_string(), recipient_string);
|
|
assert_eq!(message, b"foomp".to_vec());
|
|
assert_eq!(connection_id, Some(42))
|
|
}
|
|
_ => unreachable!(),
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn send_anonymous_request_serialization_works() {
|
|
let original_recipient = Recipient::try_from_base58_string("CytBseW6yFXUMzz4SGAKdNLGR7q3sJLLYxyBGvutNEQV.4QXYyEVc5fUDjmmi8PrHN9tdUFV4PCvSJE1278cHyvoe@4sBbL1ngf1vtNqykydQKTFh26sQCw888GpUqvPvyNB4f").unwrap();
|
|
|
|
let send_anonymous_request = ClientRequest::SendAnonymous {
|
|
recipient: original_recipient,
|
|
message: b"foomp".to_vec(),
|
|
reply_surbs: 666,
|
|
connection_id: Some(42),
|
|
};
|
|
|
|
let bytes = send_anonymous_request.serialize();
|
|
let recovered = ClientRequest::deserialize(&bytes).unwrap();
|
|
match recovered {
|
|
ClientRequest::SendAnonymous {
|
|
recipient,
|
|
message,
|
|
reply_surbs,
|
|
connection_id,
|
|
} => {
|
|
assert_eq!(recipient, original_recipient);
|
|
assert_eq!(message, b"foomp".to_vec());
|
|
assert_eq!(connection_id, Some(42));
|
|
assert_eq!(reply_surbs, 666)
|
|
}
|
|
_ => unreachable!(),
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn reply_request_serialization_works() {
|
|
let reply_request = ClientRequest::Reply {
|
|
sender_tag: [8u8; SENDER_TAG_SIZE].into(),
|
|
message: b"foomp".to_vec(),
|
|
connection_id: Some(42),
|
|
};
|
|
|
|
let bytes = reply_request.serialize();
|
|
let recovered = ClientRequest::deserialize(&bytes).unwrap();
|
|
match recovered {
|
|
ClientRequest::Reply {
|
|
sender_tag,
|
|
message,
|
|
connection_id,
|
|
} => {
|
|
assert_eq!(sender_tag, [8u8; SENDER_TAG_SIZE].into());
|
|
assert_eq!(message, b"foomp".to_vec());
|
|
assert_eq!(connection_id, Some(42));
|
|
}
|
|
_ => unreachable!(),
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn self_address_request_serialization_works() {
|
|
let self_address_request = ClientRequest::SelfAddress;
|
|
let bytes = self_address_request.serialize();
|
|
let recovered = ClientRequest::deserialize(&bytes).unwrap();
|
|
match recovered {
|
|
ClientRequest::SelfAddress => (),
|
|
_ => unreachable!(),
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn close_connection_request_serialization_works() {
|
|
let close_connection_request = ClientRequest::ClosedConnection(42);
|
|
let bytes = close_connection_request.serialize();
|
|
let recovered = ClientRequest::deserialize(&bytes).unwrap();
|
|
match recovered {
|
|
ClientRequest::ClosedConnection(id) => assert_eq!(id, 42),
|
|
_ => unreachable!(),
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn get_lane_queue_length_request_serialization_works() {
|
|
let close_connection_request = ClientRequest::GetLaneQueueLength(42);
|
|
let bytes = close_connection_request.serialize();
|
|
let recovered = ClientRequest::deserialize(&bytes).unwrap();
|
|
match recovered {
|
|
ClientRequest::GetLaneQueueLength(id) => assert_eq!(id, 42),
|
|
_ => unreachable!(),
|
|
}
|
|
}
|
|
}
|