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>
422 lines
16 KiB
Rust
422 lines
16 KiB
Rust
// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
use crate::packet::{FramedSphinxPacket, Header};
|
|
use bytes::{Buf, BufMut, BytesMut};
|
|
use nymsphinx_params::packet_modes::InvalidPacketMode;
|
|
use nymsphinx_params::packet_sizes::{InvalidPacketSize, PacketSize};
|
|
use nymsphinx_types::SphinxPacket;
|
|
use std::io;
|
|
use tokio_util::codec::{Decoder, Encoder};
|
|
|
|
#[derive(Debug)]
|
|
pub enum SphinxCodecError {
|
|
InvalidPacketSize,
|
|
InvalidPacketMode,
|
|
MalformedSphinxPacket,
|
|
IoError(io::Error),
|
|
}
|
|
|
|
impl From<io::Error> for SphinxCodecError {
|
|
fn from(err: io::Error) -> Self {
|
|
SphinxCodecError::IoError(err)
|
|
}
|
|
}
|
|
|
|
impl From<SphinxCodecError> for io::Error {
|
|
fn from(err: SphinxCodecError) -> Self {
|
|
match err {
|
|
SphinxCodecError::InvalidPacketSize => {
|
|
io::Error::new(io::ErrorKind::InvalidInput, "invalid packet size")
|
|
}
|
|
SphinxCodecError::InvalidPacketMode => {
|
|
io::Error::new(io::ErrorKind::InvalidInput, "invalid packet mode")
|
|
}
|
|
SphinxCodecError::MalformedSphinxPacket => {
|
|
io::Error::new(io::ErrorKind::InvalidData, "malformed packet")
|
|
}
|
|
SphinxCodecError::IoError(err) => err,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl From<InvalidPacketSize> for SphinxCodecError {
|
|
fn from(_: InvalidPacketSize) -> Self {
|
|
SphinxCodecError::InvalidPacketSize
|
|
}
|
|
}
|
|
|
|
impl From<InvalidPacketMode> for SphinxCodecError {
|
|
fn from(_: InvalidPacketMode) -> Self {
|
|
SphinxCodecError::InvalidPacketMode
|
|
}
|
|
}
|
|
|
|
// TODO: in the future it could be extended to have state containing symmetric encryption key
|
|
// so that all data could be encrypted easily (alternatively we could just slap TLS)
|
|
pub struct SphinxCodec;
|
|
|
|
impl Encoder<FramedSphinxPacket> for SphinxCodec {
|
|
type Error = SphinxCodecError;
|
|
|
|
fn encode(&mut self, item: FramedSphinxPacket, dst: &mut BytesMut) -> Result<(), Self::Error> {
|
|
item.header.encode(dst);
|
|
dst.put(item.packet.to_bytes().as_ref());
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
impl Decoder for SphinxCodec {
|
|
type Item = FramedSphinxPacket;
|
|
type Error = SphinxCodecError;
|
|
|
|
fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
|
|
if src.is_empty() {
|
|
// can't do anything if we have no bytes, but let's reserve enough for the most
|
|
// conservative case, i.e. receiving an ack packet
|
|
src.reserve(Header::LEGACY_SIZE + PacketSize::AckPacket.size());
|
|
return Ok(None);
|
|
}
|
|
|
|
// because header is so small and simple it makes no point in trying to cache
|
|
// this result. It will be just simpler to re-decode it
|
|
let header = match Header::decode(src)? {
|
|
Some(header) => header,
|
|
None => return Ok(None), // we have some data but not enough to get header back
|
|
};
|
|
|
|
let sphinx_packet_size = header.packet_size.size();
|
|
let frame_len = header.size() + sphinx_packet_size;
|
|
|
|
if src.len() < frame_len {
|
|
// we don't have enough bytes to read the rest of frame
|
|
src.reserve(sphinx_packet_size);
|
|
return Ok(None);
|
|
}
|
|
|
|
// advance buffer past the header - at this point we have enough bytes
|
|
src.advance(header.size());
|
|
let sphinx_packet_bytes = src.split_to(sphinx_packet_size);
|
|
let sphinx_packet = match SphinxPacket::from_bytes(&sphinx_packet_bytes) {
|
|
Ok(sphinx_packet) => sphinx_packet,
|
|
// here it could be debatable whether stream is corrupt or not,
|
|
// but let's go with the safer approach and assume it is.
|
|
Err(_) => return Err(SphinxCodecError::MalformedSphinxPacket),
|
|
};
|
|
|
|
let nymsphinx_packet = FramedSphinxPacket {
|
|
header,
|
|
packet: sphinx_packet,
|
|
};
|
|
|
|
// As per docs:
|
|
// Before returning from the function, implementations should ensure that the buffer
|
|
// has appropriate capacity in anticipation of future calls to decode.
|
|
// Failing to do so leads to inefficiency.
|
|
|
|
// if we have enough bytes to decode the header of the next packet, we can reserve enough bytes for
|
|
// the entire next frame, if not, we assume the next frame is an ack packet and
|
|
// reserve for that.
|
|
// we also assume the next packet coming from the same client will use exactly the same versioning
|
|
// as the current packet
|
|
let mut allocate_for_next_packet = header.size() + PacketSize::AckPacket.size();
|
|
if !src.is_empty() {
|
|
match Header::decode(src) {
|
|
Ok(Some(next_header)) => {
|
|
allocate_for_next_packet = next_header.size() + next_header.packet_size.size();
|
|
}
|
|
Ok(None) => {
|
|
// we don't have enough information to know how much to reserve, fallback to the ack case
|
|
}
|
|
|
|
// the next frame will be malformed but let's leave handling the error to the next
|
|
// call to 'decode', as presumably, the current sphinx packet is still valid
|
|
Err(_) => return Ok(Some(nymsphinx_packet)),
|
|
};
|
|
}
|
|
src.reserve(allocate_for_next_packet);
|
|
|
|
Ok(Some(nymsphinx_packet))
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod packet_encoding {
|
|
use super::*;
|
|
use nymsphinx_types::builder::SphinxPacketBuilder;
|
|
use nymsphinx_types::{
|
|
crypto, Delay as SphinxDelay, Destination, DestinationAddressBytes, Node, NodeAddressBytes,
|
|
DESTINATION_ADDRESS_LENGTH, IDENTIFIER_LENGTH, NODE_ADDRESS_LENGTH,
|
|
};
|
|
|
|
fn make_valid_sphinx_packet(size: PacketSize) -> SphinxPacket {
|
|
let (_, node1_pk) = crypto::keygen();
|
|
let node1 = Node::new(
|
|
NodeAddressBytes::from_bytes([5u8; NODE_ADDRESS_LENGTH]),
|
|
node1_pk,
|
|
);
|
|
let (_, node2_pk) = crypto::keygen();
|
|
let node2 = Node::new(
|
|
NodeAddressBytes::from_bytes([4u8; NODE_ADDRESS_LENGTH]),
|
|
node2_pk,
|
|
);
|
|
let (_, node3_pk) = crypto::keygen();
|
|
let node3 = Node::new(
|
|
NodeAddressBytes::from_bytes([2u8; NODE_ADDRESS_LENGTH]),
|
|
node3_pk,
|
|
);
|
|
|
|
let route = [node1, node2, node3];
|
|
let destination = Destination::new(
|
|
DestinationAddressBytes::from_bytes([3u8; DESTINATION_ADDRESS_LENGTH]),
|
|
[4u8; IDENTIFIER_LENGTH],
|
|
);
|
|
let delays = vec![
|
|
SphinxDelay::new_from_nanos(42),
|
|
SphinxDelay::new_from_nanos(42),
|
|
SphinxDelay::new_from_nanos(42),
|
|
];
|
|
SphinxPacketBuilder::new()
|
|
.with_payload_size(size.payload_size())
|
|
.build_packet(b"foomp", &route, &destination, &delays)
|
|
.unwrap()
|
|
}
|
|
|
|
#[test]
|
|
fn whole_packet_can_be_decoded_from_a_valid_encoded_instance() {
|
|
let header = Default::default();
|
|
let sphinx_packet = make_valid_sphinx_packet(Default::default());
|
|
let sphinx_bytes = sphinx_packet.to_bytes();
|
|
|
|
let packet = FramedSphinxPacket {
|
|
header,
|
|
packet: sphinx_packet,
|
|
};
|
|
|
|
let mut bytes = BytesMut::new();
|
|
SphinxCodec.encode(packet, &mut bytes).unwrap();
|
|
let decoded = SphinxCodec.decode(&mut bytes).unwrap().unwrap();
|
|
|
|
assert_eq!(decoded.header, header);
|
|
assert_eq!(decoded.packet.to_bytes(), sphinx_bytes)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod decode_will_allocate_enough_bytes_for_next_call {
|
|
use super::*;
|
|
use nymsphinx_params::packet_version::PacketVersion;
|
|
use nymsphinx_params::PacketMode;
|
|
|
|
#[test]
|
|
fn for_empty_bytes() {
|
|
// empty bytes should allocate for header + ack packet
|
|
let mut empty_bytes = BytesMut::new();
|
|
assert!(SphinxCodec.decode(&mut empty_bytes).unwrap().is_none());
|
|
assert_eq!(
|
|
empty_bytes.capacity(),
|
|
Header::LEGACY_SIZE + PacketSize::AckPacket.size()
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn for_bytes_with_legacy_header() {
|
|
// if header gets decoded there should be enough bytes for the entire frame
|
|
let packet_sizes = vec![
|
|
PacketSize::AckPacket,
|
|
PacketSize::RegularPacket,
|
|
PacketSize::ExtendedPacket8,
|
|
PacketSize::ExtendedPacket16,
|
|
PacketSize::ExtendedPacket32,
|
|
];
|
|
for packet_size in packet_sizes {
|
|
let header = Header {
|
|
packet_version: PacketVersion::Legacy,
|
|
packet_size,
|
|
packet_mode: Default::default(),
|
|
};
|
|
let mut bytes = BytesMut::new();
|
|
header.encode(&mut bytes);
|
|
assert!(SphinxCodec.decode(&mut bytes).unwrap().is_none());
|
|
|
|
assert_eq!(bytes.capacity(), Header::LEGACY_SIZE + packet_size.size())
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn for_bytes_with_versioned_header() {
|
|
// if header gets decoded there should be enough bytes for the entire frame
|
|
let packet_sizes = vec![
|
|
PacketSize::AckPacket,
|
|
PacketSize::RegularPacket,
|
|
PacketSize::ExtendedPacket8,
|
|
PacketSize::ExtendedPacket16,
|
|
PacketSize::ExtendedPacket32,
|
|
];
|
|
for packet_size in packet_sizes {
|
|
let header = Header {
|
|
packet_version: PacketVersion::Versioned(123),
|
|
packet_size,
|
|
packet_mode: Default::default(),
|
|
};
|
|
let mut bytes = BytesMut::new();
|
|
header.encode(&mut bytes);
|
|
assert!(SphinxCodec.decode(&mut bytes).unwrap().is_none());
|
|
|
|
assert_eq!(
|
|
bytes.capacity(),
|
|
Header::VERSIONED_SIZE + packet_size.size()
|
|
)
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn for_full_frame_with_legacy_header() {
|
|
// if full frame is used exactly, there should be enough space for header + ack packet
|
|
let packet = FramedSphinxPacket {
|
|
header: Header {
|
|
packet_version: PacketVersion::Legacy,
|
|
packet_size: Default::default(),
|
|
packet_mode: Default::default(),
|
|
},
|
|
packet: make_valid_sphinx_packet(Default::default()),
|
|
};
|
|
|
|
let mut bytes = BytesMut::new();
|
|
SphinxCodec.encode(packet, &mut bytes).unwrap();
|
|
assert!(SphinxCodec.decode(&mut bytes).unwrap().is_some());
|
|
assert_eq!(
|
|
bytes.capacity(),
|
|
Header::LEGACY_SIZE + PacketSize::AckPacket.size()
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn for_full_frame_with_versioned_header() {
|
|
// if full frame is used exactly, there should be enough space for header + ack packet
|
|
let packet = FramedSphinxPacket {
|
|
header: Header::default(),
|
|
packet: make_valid_sphinx_packet(Default::default()),
|
|
};
|
|
|
|
let mut bytes = BytesMut::new();
|
|
SphinxCodec.encode(packet, &mut bytes).unwrap();
|
|
assert!(SphinxCodec.decode(&mut bytes).unwrap().is_some());
|
|
assert_eq!(
|
|
bytes.capacity(),
|
|
Header::VERSIONED_SIZE + PacketSize::AckPacket.size()
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn for_full_frame_with_extra_bytes_with_legacy_header() {
|
|
// if there was at least 2 byte left, there should be enough space for entire next frame
|
|
let packet_sizes = vec![
|
|
PacketSize::AckPacket,
|
|
PacketSize::RegularPacket,
|
|
PacketSize::ExtendedPacket8,
|
|
PacketSize::ExtendedPacket16,
|
|
PacketSize::ExtendedPacket32,
|
|
];
|
|
|
|
for packet_size in packet_sizes {
|
|
let first_packet = FramedSphinxPacket {
|
|
header: Header {
|
|
packet_version: PacketVersion::Legacy,
|
|
packet_size: Default::default(),
|
|
packet_mode: Default::default(),
|
|
},
|
|
packet: make_valid_sphinx_packet(Default::default()),
|
|
};
|
|
|
|
let mut bytes = BytesMut::new();
|
|
SphinxCodec.encode(first_packet, &mut bytes).unwrap();
|
|
bytes.put_u8(packet_size as u8);
|
|
bytes.put_u8(PacketMode::default() as u8);
|
|
assert!(SphinxCodec.decode(&mut bytes).unwrap().is_some());
|
|
|
|
assert!(bytes.capacity() >= Header::LEGACY_SIZE + packet_size.size())
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn for_full_frame_with_extra_bytes_with_versioned_header() {
|
|
// if there was at least 3 byte left, there should be enough space for entire next frame
|
|
let packet_sizes = vec![
|
|
PacketSize::AckPacket,
|
|
PacketSize::RegularPacket,
|
|
PacketSize::ExtendedPacket8,
|
|
PacketSize::ExtendedPacket16,
|
|
PacketSize::ExtendedPacket32,
|
|
];
|
|
|
|
for packet_size in packet_sizes {
|
|
let first_packet = FramedSphinxPacket {
|
|
header: Header::default(),
|
|
packet: make_valid_sphinx_packet(Default::default()),
|
|
};
|
|
|
|
let mut bytes = BytesMut::new();
|
|
SphinxCodec.encode(first_packet, &mut bytes).unwrap();
|
|
bytes.put_u8(PacketVersion::new_versioned(123).as_u8().unwrap());
|
|
bytes.put_u8(packet_size as u8);
|
|
bytes.put_u8(PacketMode::default() as u8);
|
|
assert!(SphinxCodec.decode(&mut bytes).unwrap().is_some());
|
|
|
|
assert!(bytes.capacity() >= Header::VERSIONED_SIZE + packet_size.size())
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn can_decode_two_packets_immediately() {
|
|
let packet1 = FramedSphinxPacket {
|
|
header: Header::default(),
|
|
packet: make_valid_sphinx_packet(Default::default()),
|
|
};
|
|
|
|
let packet2 = FramedSphinxPacket {
|
|
header: Header::default(),
|
|
packet: make_valid_sphinx_packet(Default::default()),
|
|
};
|
|
|
|
let mut bytes = BytesMut::new();
|
|
|
|
SphinxCodec.encode(packet1, &mut bytes).unwrap();
|
|
SphinxCodec.encode(packet2, &mut bytes).unwrap();
|
|
|
|
assert!(SphinxCodec.decode(&mut bytes).unwrap().is_some());
|
|
assert!(SphinxCodec.decode(&mut bytes).unwrap().is_some());
|
|
assert!(SphinxCodec.decode(&mut bytes).unwrap().is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn can_decode_two_packets_in_separate_calls() {
|
|
let packet1 = FramedSphinxPacket {
|
|
header: Header::default(),
|
|
packet: make_valid_sphinx_packet(Default::default()),
|
|
};
|
|
|
|
let packet2 = FramedSphinxPacket {
|
|
header: Header::default(),
|
|
packet: make_valid_sphinx_packet(Default::default()),
|
|
};
|
|
|
|
let mut bytes = BytesMut::new();
|
|
let mut bytes_tmp = BytesMut::new();
|
|
|
|
SphinxCodec.encode(packet1, &mut bytes).unwrap();
|
|
SphinxCodec.encode(packet2, &mut bytes_tmp).unwrap();
|
|
|
|
let tmp = bytes_tmp.split_off(100);
|
|
bytes.put(bytes_tmp);
|
|
|
|
assert!(SphinxCodec.decode(&mut bytes).unwrap().is_some());
|
|
assert!(SphinxCodec.decode(&mut bytes).unwrap().is_none());
|
|
|
|
bytes.put(tmp);
|
|
|
|
assert!(SphinxCodec.decode(&mut bytes).unwrap().is_some());
|
|
assert!(SphinxCodec.decode(&mut bytes).unwrap().is_none());
|
|
}
|
|
}
|