Skip to content

Commit

Permalink
Change E2EE chunks from WS chunks to a new custom blocking mode
Browse files Browse the repository at this point in the history
  • Loading branch information
Sajjad Pourali authored and Sajjad Pourali committed Nov 20, 2023
1 parent dfaf756 commit fc03c21
Show file tree
Hide file tree
Showing 10 changed files with 204 additions and 165 deletions.
71 changes: 28 additions & 43 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ tokio-util = { version = "0.7.10", default-features = false }
serde = { version = "1.0.192", default-features = false, features = ["derive"] }
serde_json = { version = "1.0.108", default-features = false }
serde_yaml = { version = "0.9.27", default-features = false }
uuid = { version = "1.5.0", default-features = false }
uuid = { version = "1.6.0", default-features = false }
sysinfo = { version = "0.29.10", default-features = false }
futures-channel = { version = "0.3.29", features = [
"sink",
Expand All @@ -42,12 +42,12 @@ dirs = { version = "5.0.1", default-features = false }
tracing = { version = "0.1.40", default-features = false, features = [
"attributes",
] }
tracing-subscriber = { version = "0.3.17", default-features = false, features = [
tracing-subscriber = { version = "0.3.18", default-features = false, features = [
"fmt",
"ansi",
"json",
] }
tracing-appender = { version = "0.2.2", default-features = false }
tracing-appender = { version = "0.2.3", default-features = false }
clap_lex = { version = "0.6.0", default-features = false }
thiserror = { version = "1.0.50", default-features = false }
# base64 = { version = "0.21.0", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions agent/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ async fn start(args: Args) -> Result<(), AgentError> {
}
};
if let (Some(k), Some(n)) = (k, n) {
s = Box::new(AsyncSocketCrypt::new(k, n, s, false).await);
s = Box::new(AsyncSocketCrypt::new(k, n, s).await);
}
if let Err(_e) = async_forward(s, stream).await {
trace!("Data channel closed: {}", _e.to_string());
Expand Down Expand Up @@ -606,7 +606,7 @@ async fn data_connect(
Box::new(WsConnectionBinary::new(gateway_addr, headers, &service_type).await?);
trace!("Connected to gateway for Data channel");
if let (Some(k), Some(n)) = (k, n) {
data_stream = Box::new(AsyncSocketCrypt::new(k, n, data_stream, false).await);
data_stream = Box::new(AsyncSocketCrypt::new(k, n, data_stream).await);
}

if let Err(_e) = async_forward(data_stream, socket).await {
Expand Down
6 changes: 3 additions & 3 deletions client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,18 @@ either = { version = "1.9.0", default-features = false }
tracing = { version = "0.1.40", default-features = false, features = [
"attributes",
] }
tracing-subscriber = { version = "0.3.17", default-features = false, features = [
tracing-subscriber = { version = "0.3.18", default-features = false, features = [
"fmt",
"ansi",
"json",
] }
tracing-appender = { version = "0.2.2" }
tracing-appender = { version = "0.2.3" }
proxy-stream = { version = "0.0.2", default-features = false }
sha3 = { version = "0.10.8", default-features = false }
hmac = { version = "0.12.1", default-features = false }
rand = { version = "0.8.5", default-features = false }
dirs = { version = "5.0.1", default-features = false }
uuid = { version = "1.5.0", features = ["v4"], default-features = false }
uuid = { version = "1.6.0", features = ["v4"], default-features = false }
chrono = { version = "0.4.31", default-features = false }

narrowlink-types = { version = "0.2.2-git", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions client/src/transport.rs
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ impl TransportFactory {

if let Some((key, nonce)) = e2ee_params {
Ok((
Box::new(AsyncSocketCrypt::new(key, nonce, Box::new(quic_socket), true).await),
Box::new(AsyncSocketCrypt::new(key, nonce, Box::new(quic_socket)).await),
None,
))
} else {
Expand Down Expand Up @@ -319,7 +319,7 @@ impl TransportFactory {

if let Some((key, nonce)) = e2ee_params {
Ok((
Box::new(AsyncSocketCrypt::new(key, nonce, Box::new(connection), true).await),
Box::new(AsyncSocketCrypt::new(key, nonce, Box::new(connection)).await),
connection_id,
))
} else {
Expand Down
8 changes: 4 additions & 4 deletions gateway/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ hyper = { version = "0.14.27", features = ["full"] }
tracing = { version = "0.1.40", default-features = false, features = [
"attributes",
] }
tracing-subscriber = { version = "0.3.17", default-features = false, features = [
tracing-subscriber = { version = "0.3.18", default-features = false, features = [
"fmt",
"ansi",
"json",
] }
tracing-appender = { version = "0.2.2", default-features = false }
tracing-appender = { version = "0.2.3", default-features = false }
dirs = { version = "5.0.1", default-features = false }
serde_json = { version = "1.0.108", default-features = false }
serde_yaml = { version = "0.9.27", default-features = false }
Expand All @@ -39,7 +39,7 @@ async-trait = { version = "0.1.74", default-features = false }
futures-util = { version = "0.3.29", default-features = false }
askama = { version = "0.12.1", default-features = false }
pem = { version = "3.0.2", default-features = false, features = ["std"] }
uuid = { version = "1.5.0", default-features = false, features = [
uuid = { version = "1.6.0", default-features = false, features = [
"v4",
"serde",
] }
Expand All @@ -48,7 +48,7 @@ instant-acme = { version = "0.4.1", default-features = false, features = [
"hyper-rustls",
] }
tokio-rustls = { version = "0.24.1", default-features = false }
rustls = { version = "0.21.8", default-features = false }
rustls = { version = "0.21.9", default-features = false }
rustls-pemfile = { version = "1.0.4", default-features = false }
validator = { version = "0.16.1", default-features = false, features = [
"derive",
Expand Down
2 changes: 1 addition & 1 deletion network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ tokio = { version = "1.34.0", features = [
"rt-multi-thread",
], default-features = false }
tokio-rustls = { version = "0.24.1", default-features = false }
rustls = { version = "0.21.8", default-features = false }
rustls = { version = "0.21.9", default-features = false }
webpki-roots = { version = "0.25.2", default-features = false }
hyper = { version = "0.14.27", features = [
"client",
Expand Down

0 comments on commit fc03c21

Please sign in to comment.