-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
43 changed files
with
9,196 additions
and
549 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,188 @@ | ||
| #![allow(unused)] | ||
|
|
||
| use crate::{ | ||
| common::{colorize, HmacSha256}, | ||
| constants::*, | ||
| framing::{FrameError, Marshall, O5Codec, TryParse, KEY_LENGTH, KEY_MATERIAL_LENGTH}, | ||
| handshake::O5NtorPublicKey, | ||
| proto::{MaybeTimeout, O5Stream, IAT}, | ||
| sessions, Error, Result, | ||
| }; | ||
|
|
||
| use bytes::{Buf, BufMut, BytesMut}; | ||
| use hmac::{Hmac, Mac}; | ||
| use ptrs::{debug, info, trace, warn}; | ||
| use rand::prelude::*; | ||
| use subtle::ConstantTimeEq; | ||
| use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt}; | ||
| use tokio::time::{Duration, Instant}; | ||
|
|
||
| use std::{ | ||
| fmt, | ||
| io::{Error as IoError, ErrorKind as IoErrorKind}, | ||
| pin::Pin, | ||
| sync::{Arc, Mutex}, | ||
| }; | ||
|
|
||
| #[derive(Clone, Debug)] | ||
| pub struct ClientBuilder { | ||
| pub iat_mode: IAT, | ||
| pub station_pubkey: [u8; KEY_LENGTH], | ||
| pub station_id: [u8; NODE_ID_LENGTH], | ||
| pub statefile_path: Option<String>, | ||
| pub(crate) handshake_timeout: MaybeTimeout, | ||
| } | ||
|
|
||
| impl Default for ClientBuilder { | ||
| fn default() -> Self { | ||
| Self { | ||
| iat_mode: IAT::Off, | ||
| station_pubkey: [0u8; KEY_LENGTH], | ||
| station_id: [0_u8; NODE_ID_LENGTH], | ||
| statefile_path: None, | ||
| handshake_timeout: MaybeTimeout::Default_, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl ClientBuilder { | ||
| /// TODO: implement client builder from statefile | ||
| pub fn from_statefile(location: &str) -> Result<Self> { | ||
| Ok(Self { | ||
| iat_mode: IAT::Off, | ||
| station_pubkey: [0_u8; KEY_LENGTH], | ||
| station_id: [0_u8; NODE_ID_LENGTH], | ||
| statefile_path: Some(location.into()), | ||
| handshake_timeout: MaybeTimeout::Default_, | ||
| }) | ||
| } | ||
|
|
||
| /// TODO: implement client builder from string args | ||
| pub fn from_params(param_strs: Vec<impl AsRef<[u8]>>) -> Result<Self> { | ||
| Ok(Self { | ||
| iat_mode: IAT::Off, | ||
| station_pubkey: [0_u8; KEY_LENGTH], | ||
| station_id: [0_u8; NODE_ID_LENGTH], | ||
| statefile_path: None, | ||
| handshake_timeout: MaybeTimeout::Default_, | ||
| }) | ||
| } | ||
|
|
||
| pub fn with_node_pubkey(&mut self, pubkey: [u8; KEY_LENGTH]) -> &mut Self { | ||
| self.station_pubkey = pubkey; | ||
| self | ||
| } | ||
|
|
||
| pub fn with_statefile_path(&mut self, path: &str) -> &mut Self { | ||
| self.statefile_path = Some(path.into()); | ||
| self | ||
| } | ||
|
|
||
| pub fn with_node_id(&mut self, id: [u8; NODE_ID_LENGTH]) -> &mut Self { | ||
| self.station_id = id; | ||
| self | ||
| } | ||
|
|
||
| pub fn with_iat_mode(&mut self, iat: IAT) -> &mut Self { | ||
| self.iat_mode = iat; | ||
| self | ||
| } | ||
|
|
||
| pub fn with_handshake_timeout(&mut self, d: Duration) -> &mut Self { | ||
| self.handshake_timeout = MaybeTimeout::Length(d); | ||
| self | ||
| } | ||
|
|
||
| pub fn with_handshake_deadline(&mut self, deadline: Instant) -> &mut Self { | ||
| self.handshake_timeout = MaybeTimeout::Fixed(deadline); | ||
| self | ||
| } | ||
|
|
||
| pub fn fail_fast(&mut self) -> &mut Self { | ||
| self.handshake_timeout = MaybeTimeout::Unset; | ||
| self | ||
| } | ||
|
|
||
| pub fn build(&self) -> Client { | ||
| Client { | ||
| iat_mode: self.iat_mode, | ||
| station_pubkey: O5NtorPublicKey { | ||
| id: self.station_id.into(), | ||
| pk: self.station_pubkey.into(), | ||
| }, | ||
| handshake_timeout: self.handshake_timeout.duration(), | ||
| } | ||
| } | ||
|
|
||
| pub fn as_opts(&self) -> String { | ||
| //TODO: String self as command line options | ||
| "".into() | ||
| } | ||
| } | ||
|
|
||
| impl fmt::Display for ClientBuilder { | ||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
| //TODO: string self | ||
| write!(f, "") | ||
| } | ||
| } | ||
|
|
||
| /// Client implementing the obfs4 protocol. | ||
| pub struct Client { | ||
| iat_mode: IAT, | ||
| station_pubkey: O5NtorPublicKey, | ||
| handshake_timeout: Option<tokio::time::Duration>, | ||
| } | ||
|
|
||
| impl Client { | ||
| /// TODO: extract args to create new builder | ||
| pub fn get_args(&mut self, _args: &dyn std::any::Any) {} | ||
|
|
||
| /// On a failed handshake the client will read for the remainder of the | ||
| /// handshake timeout and then close the connection. | ||
| pub async fn wrap<'a, T>(self, mut stream: T) -> Result<O5Stream<T>> | ||
| where | ||
| T: AsyncRead + AsyncWrite + Unpin + 'a, | ||
| { | ||
| let session = sessions::new_client_session(self.station_pubkey, self.iat_mode); | ||
|
|
||
| let deadline = self.handshake_timeout.map(|d| Instant::now() + d); | ||
|
|
||
| session.handshake(stream, deadline).await | ||
| } | ||
|
|
||
| /// On a failed handshake the client will read for the remainder of the | ||
| /// handshake timeout and then close the connection. | ||
| pub async fn establish<'a, T, E>( | ||
| self, | ||
| mut stream_fut: Pin<ptrs::FutureResult<T, E>>, | ||
| ) -> Result<O5Stream<T>> | ||
| where | ||
| T: AsyncRead + AsyncWrite + Unpin + 'a, | ||
| E: std::error::Error + Send + Sync + 'static, | ||
| { | ||
| let stream = stream_fut.await.map_err(|e| Error::Other(Box::new(e)))?; | ||
|
|
||
| let session = sessions::new_client_session(self.station_pubkey, self.iat_mode); | ||
|
|
||
| let deadline = self.handshake_timeout.map(|d| Instant::now() + d); | ||
|
|
||
| session.handshake(stream, deadline).await | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod test { | ||
| use super::*; | ||
| use crate::Result; | ||
|
|
||
| #[test] | ||
| fn parse_params() -> Result<()> { | ||
| let test_args = [["", "", ""]]; | ||
|
|
||
| for (i, test_case) in test_args.iter().enumerate() { | ||
| let cb = ClientBuilder::from_params(test_case.to_vec())?; | ||
| } | ||
| Ok(()) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
|
|
||
| # Common tools | ||
|
|
||
|
|
||
|
|
||
|
|
||
| ### TODO | ||
|
|
||
| - [ ] better probdist actually using [Distribution]() for [Rng]()? | ||
| - we want this to be possible to implement in both rust and golang. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| //! Constant-time utilities. | ||
| use subtle::{Choice, ConstantTimeEq}; | ||
|
|
||
| /// Convert a boolean into a Choice. | ||
| /// | ||
| /// This isn't necessarily a good idea or constant-time. | ||
| pub(crate) fn bool_to_choice(v: bool) -> Choice { | ||
| Choice::from(u8::from(v)) | ||
| } | ||
|
|
||
| /// Return true if two slices are equal. Performs its operation in constant | ||
| /// time, but returns a bool instead of a subtle::Choice. | ||
| #[allow(unused)] | ||
| pub(crate) fn bytes_eq(a: &[u8], b: &[u8]) -> bool { | ||
| let choice = a.ct_eq(b); | ||
| choice.unwrap_u8() == 1 | ||
| } |
Oops, something went wrong.