Jon Häggblad
8304146195
* Fix decrypting stored received msg * rustfmt * Moving binary message recovery to separate function Co-authored-by: Jędrzej Stuczyński <jedrzej.stuczynski@gmail.com>
61 lines
1.8 KiB
Rust
61 lines
1.8 KiB
Rust
// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
use crate::error::GatewayClientError;
|
|
pub use client::GatewayClient;
|
|
use gateway_requests::registration::handshake::SharedKeys;
|
|
use gateway_requests::BinaryResponse;
|
|
use log::warn;
|
|
pub use packet_router::{
|
|
AcknowledgementReceiver, AcknowledgementSender, MixnetMessageReceiver, MixnetMessageSender,
|
|
};
|
|
use tungstenite::{protocol::Message, Error as WsError};
|
|
|
|
pub mod bandwidth;
|
|
pub mod client;
|
|
pub mod error;
|
|
pub mod packet_router;
|
|
pub mod socket_state;
|
|
#[cfg(feature = "wasm")]
|
|
mod wasm_storage;
|
|
|
|
/// Helper method for reading from websocket stream. Helps to flatten the structure.
|
|
pub(crate) fn cleanup_socket_message(
|
|
msg: Option<Result<Message, WsError>>,
|
|
) -> Result<Message, GatewayClientError> {
|
|
match msg {
|
|
Some(msg) => msg.map_err(GatewayClientError::NetworkError),
|
|
None => Err(GatewayClientError::ConnectionAbruptlyClosed),
|
|
}
|
|
}
|
|
|
|
pub(crate) fn cleanup_socket_messages(
|
|
msgs: Option<Vec<Result<Message, WsError>>>,
|
|
) -> Result<Vec<Message>, GatewayClientError> {
|
|
match msgs {
|
|
Some(msgs) => msgs
|
|
.into_iter()
|
|
.map(|msg| msg.map_err(GatewayClientError::NetworkError))
|
|
.collect(),
|
|
None => Err(GatewayClientError::ConnectionAbruptlyClosed),
|
|
}
|
|
}
|
|
|
|
pub(crate) fn try_decrypt_binary_message(
|
|
bin_msg: Vec<u8>,
|
|
shared_keys: &SharedKeys,
|
|
) -> Option<Vec<u8>> {
|
|
match BinaryResponse::try_from_encrypted_tagged_bytes(bin_msg, shared_keys) {
|
|
Ok(bin_response) => match bin_response {
|
|
BinaryResponse::PushedMixMessage(plaintext) => Some(plaintext),
|
|
},
|
|
Err(err) => {
|
|
warn!(
|
|
"message received from the gateway was malformed! - {:?}",
|
|
err
|
|
);
|
|
None
|
|
}
|
|
}
|
|
}
|