diff --git a/Cargo.lock b/Cargo.lock index 662cfb1516..32a98f79ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -92,7 +92,7 @@ dependencies = [ "agent-tunnel-proto", "anyhow", "async-trait", - "base64 0.23.0", + "base64 0.23.1", "camino", "devolutions-gateway-task", "hex", @@ -533,7 +533,7 @@ dependencies = [ "sha1 0.10.7", "sync_wrapper 1.0.2", "tokio 1.52.3", - "tokio-tungstenite", + "tokio-tungstenite 0.29.0", "tower 0.5.3", "tower-layer", "tower-service", @@ -699,9 +699,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b25655df2c3cdd83c5e5b293b88acd880332b2ddadd7c30ac43144fdc0033da9" +checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" [[package]] name = "base64ct" @@ -1690,7 +1690,7 @@ dependencies = [ "aws-lc-rs", "axum 0.8.9", "backoff", - "base64 0.23.0", + "base64 0.23.1", "bytes 1.12.1", "camino", "ceviche", @@ -1787,7 +1787,7 @@ dependencies = [ "axum 0.8.9", "axum-extra", "backoff", - "base64 0.23.0", + "base64 0.23.1", "bitflags 2.13.0", "bytes 1.12.1", "cadeau", @@ -1859,7 +1859,7 @@ dependencies = [ "tokio-retry", "tokio-rustls", "tokio-test", - "tokio-tungstenite", + "tokio-tungstenite 0.30.0", "tower 0.5.3", "tower-http 0.5.2", "tracing", @@ -1868,7 +1868,7 @@ dependencies = [ "traffic-audit", "traffic-audit-libsql", "transport", - "tungstenite", + "tungstenite 0.29.0", "typed-builder", "ulid", "url", @@ -1922,7 +1922,7 @@ dependencies = [ "async-trait", "axum 0.8.9", "base16ct 0.2.0", - "base64 0.23.0", + "base64 0.23.1", "bb8", "bb8-postgres", "camino", @@ -3750,7 +3750,7 @@ name = "jetsocat" version = "2026.2.4" dependencies = [ "anyhow", - "base64 0.23.0", + "base64 0.23.1", "dirs-next", "embed-resource", "futures-util", @@ -3773,7 +3773,7 @@ dependencies = [ "sysinfo", "tinyjson", "tokio 1.52.3", - "tokio-tungstenite", + "tokio-tungstenite 0.30.0", "tracing", "tracing-appender", "tracing-subscriber", @@ -7463,7 +7463,7 @@ dependencies = [ "portpicker", "proptest", "tokio 1.52.3", - "tokio-tungstenite", + "tokio-tungstenite 0.30.0", "transport", ] @@ -7473,7 +7473,7 @@ version = "0.0.0" dependencies = [ "anyhow", "assert_cmd", - "base64 0.23.0", + "base64 0.23.1", "dynosaur", "escargot", "expect-test", @@ -7493,7 +7493,7 @@ dependencies = [ "test-utils", "tokio 1.52.3", "tokio-rustls", - "tokio-tungstenite", + "tokio-tungstenite 0.30.0", "tokio-util", "typed-builder", ] @@ -7786,6 +7786,18 @@ name = "tokio-tungstenite" version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f72a05e828585856dacd553fba484c242c46e391fb0e58917c942ee9202915c" +dependencies = [ + "futures-util", + "log", + "tokio 1.52.3", + "tungstenite 0.29.0", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17a073bfed563fa236697a068031408a93cd9522e08abf9933ead3e73411bd71" dependencies = [ "futures-util", "log", @@ -7796,7 +7808,7 @@ dependencies = [ "tokio 1.52.3", "tokio-native-tls", "tokio-rustls", - "tungstenite", + "tungstenite 0.30.0", ] [[package]] @@ -8327,11 +8339,27 @@ dependencies = [ "http 1.4.2", "httparse", "log", - "native-tls", "rand 0.9.5", + "sha1 0.10.7", + "thiserror 2.0.18", +] + +[[package]] +name = "tungstenite" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48ac77174b19c110a50ab2128b24215ac9cb40e0e12e093fb602d175c569d22" +dependencies = [ + "bytes 1.12.1", + "data-encoding", + "http 1.4.2", + "httparse", + "log", + "native-tls", + "rand 0.10.2", "rustls 0.23.42", "rustls-pki-types", - "sha1 0.10.7", + "sha1 0.11.0", "thiserror 2.0.18", ] @@ -8582,7 +8610,7 @@ dependencies = [ "num_cpus", "thiserror 2.0.18", "tokio 1.52.3", - "tokio-tungstenite", + "tokio-tungstenite 0.30.0", "tokio-util", "tracing", "tracing-subscriber", diff --git a/crates/test-utils/Cargo.toml b/crates/test-utils/Cargo.toml index 6371d0d3e1..903994865b 100644 --- a/crates/test-utils/Cargo.toml +++ b/crates/test-utils/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] transport = { path = "../transport" } tokio = { version = "1.52", features = ["io-util"] } -tokio-tungstenite = "0.29" +tokio-tungstenite = "0.30" futures-util = "0.3" proptest = "1.7" anyhow = "1.0" diff --git a/crates/video-streamer/Cargo.toml b/crates/video-streamer/Cargo.toml index dd93154e4d..293a54a339 100644 --- a/crates/video-streamer/Cargo.toml +++ b/crates/video-streamer/Cargo.toml @@ -43,7 +43,7 @@ tokio = { version = "1.52", features = [ ] } axum = { version = "0.8", features = ["ws"] } futures = "0.3" -tokio-tungstenite = "0.29" +tokio-tungstenite = "0.30" transport = { path = "../transport" } [lints] diff --git a/devolutions-gateway/Cargo.toml b/devolutions-gateway/Cargo.toml index e0bafdce1e..af41c52ba3 100644 --- a/devolutions-gateway/Cargo.toml +++ b/devolutions-gateway/Cargo.toml @@ -104,7 +104,7 @@ axum = { version = "0.8", default-features = false, features = ["http1", "json", axum-extra = { version = "0.10", features = ["query", "async-read-body", "typed-header"] } tower-http = { version = "0.5", features = ["cors", "fs"] } tungstenite = "0.29" # Should be the same version as `axum` (we perform error downcasting for better error reporting) -tokio-tungstenite = { version = "0.29", features = ["rustls-tls-native-roots"] } # Should use the same version of tungstenite as `axum` +tokio-tungstenite = { version = "0.30", features = ["rustls-tls-native-roots"] } # Should use the same version of tungstenite as `axum` http-body-util = "0.1" tokio-retry = "0.3" zip = { version = "2.4", default-features = false } diff --git a/devolutions-gateway/src/api/fwd.rs b/devolutions-gateway/src/api/fwd.rs index b2099519a5..2bc7d3e670 100644 --- a/devolutions-gateway/src/api/fwd.rs +++ b/devolutions-gateway/src/api/fwd.rs @@ -322,7 +322,7 @@ async fn fwd_http( use axum::http::{Response, header}; use http_body_util::BodyExt as _; // into_data_stream use tokio_rustls::rustls; - use tokio_tungstenite::connect_async_tls_with_config; + use tokio_tungstenite::{connect_async_tls_with_config, tungstenite}; // Default HTTP client for typical usage. static CLIENT: LazyLock = LazyLock::new(reqwest::Client::new); diff --git a/jetsocat/Cargo.toml b/jetsocat/Cargo.toml index 3e7daa8025..5f7fdf6423 100644 --- a/jetsocat/Cargo.toml +++ b/jetsocat/Cargo.toml @@ -41,7 +41,7 @@ humantime = "2.2" # async tokio = { version = "1.52", features = ["io-std", "io-util", "net", "fs", "signal", "time", "rt", "sync", "process", "rt-multi-thread", "macros"] } -tokio-tungstenite = "0.29" +tokio-tungstenite = "0.30" futures-util = "0.3" transport = { path = "../crates/transport" } diff --git a/testsuite/Cargo.toml b/testsuite/Cargo.toml index 895e125318..caf0c63dbe 100644 --- a/testsuite/Cargo.toml +++ b/testsuite/Cargo.toml @@ -28,7 +28,7 @@ tempfile = "3" tokio = { version = "1", features = ["rt-multi-thread", "macros", "time", "net", "process"] } tokio-util = "0.7" typed-builder = "0.21" -tokio-tungstenite = { version = "0.29", features = ["rustls-tls-native-roots"] } +tokio-tungstenite = { version = "0.30", features = ["rustls-tls-native-roots"] } [dev-dependencies] base64 = "0.23"