From bbe901319d49a3d70caf7b37da2c29f7d7996e07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Aug 2026 10:50:15 -0500 Subject: [PATCH] deps: bump tokio-tungstenite from 0.24.0 to 0.30.0 (#2967) Bumps [tokio-tungstenite](https://github.com/snapview/tokio-tungstenite) from 0.24.0 to 0.30.0.
Changelog

Sourced from tokio-tungstenite's changelog.

0.30.0

0.29.0

0.28.0

0.27.0

0.26.2

0.26.1

0.26.0

0.25.0

Commits

--------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: JerrettDavis --- Cargo.lock | 84 +++++++++++++++++-- crates/headroom-proxy/Cargo.toml | 4 +- crates/headroom-proxy/src/websocket.rs | 8 +- crates/headroom-proxy/tests/integration_ws.rs | 4 +- 4 files changed, 84 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ccc61141b..2da32bedf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -281,7 +281,7 @@ dependencies = [ "fastrand", "hex", "http 1.5.0", - "sha1", + "sha1 0.10.6", "time", "tokio", "tracing", @@ -682,10 +682,10 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sha1", + "sha1 0.10.6", "sync_wrapper", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.24.0", "tower", "tower-layer", "tower-service", @@ -916,6 +916,17 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +[[package]] +name = "chacha20" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "rand_core 0.10.1", +] + [[package]] name = "chrono" version = "0.4.45" @@ -1782,6 +1793,7 @@ dependencies = [ "cfg-if", "libc", "r-efi 6.0.0", + "rand_core 0.10.1", ] [[package]] @@ -1954,7 +1966,7 @@ dependencies = [ "thiserror 2.0.20", "tokio", "tokio-stream", - "tokio-tungstenite", + "tokio-tungstenite 0.30.0", "tokio-util", "tower", "tower-http 0.7.0", @@ -3402,6 +3414,17 @@ dependencies = [ "rand_core 0.9.5", ] +[[package]] +name = "rand" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80" +dependencies = [ + "chacha20", + "getrandom 0.4.3", + "rand_core 0.10.1", +] + [[package]] name = "rand_chacha" version = "0.3.1" @@ -3440,6 +3463,12 @@ dependencies = [ "getrandom 0.3.4", ] +[[package]] +name = "rand_core" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" + [[package]] name = "rand_xorshift" version = "0.4.0" @@ -3955,6 +3984,17 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha1" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "digest 0.11.3", +] + [[package]] name = "sha2" version = "0.10.9" @@ -4396,6 +4436,18 @@ name = "tokio-tungstenite" version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.24.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", @@ -4403,7 +4455,7 @@ dependencies = [ "rustls-pki-types", "tokio", "tokio-rustls", - "tungstenite", + "tungstenite 0.30.0", "webpki-roots 0.26.11", ] @@ -4729,13 +4781,29 @@ dependencies = [ "httparse", "log", "rand 0.8.6", - "rustls", - "rustls-pki-types", - "sha1", + "sha1 0.10.6", "thiserror 1.0.69", "utf-8", ] +[[package]] +name = "tungstenite" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48ac77174b19c110a50ab2128b24215ac9cb40e0e12e093fb602d175c569d22" +dependencies = [ + "bytes", + "data-encoding", + "http 1.5.0", + "httparse", + "log", + "rand 0.10.2", + "rustls", + "rustls-pki-types", + "sha1 0.11.0", + "thiserror 2.0.20", +] + [[package]] name = "typenum" version = "1.20.1" diff --git a/crates/headroom-proxy/Cargo.toml b/crates/headroom-proxy/Cargo.toml index 813b826a7..b1f5088f1 100644 --- a/crates/headroom-proxy/Cargo.toml +++ b/crates/headroom-proxy/Cargo.toml @@ -23,7 +23,7 @@ tower-http = { version = "0.7", features = ["trace", "request-id", "util"] } tracing = { workspace = true } tracing-subscriber = { version = "0.3", features = ["json", "env-filter", "fmt"] } reqwest = { version = "0.12", default-features = false, features = ["stream", "rustls-tls", "http2"] } -tokio-tungstenite = { version = "0.24", default-features = false, features = ["connect", "rustls-tls-webpki-roots"] } +tokio-tungstenite = { version = "0.30", default-features = false, features = ["connect", "rustls-tls-webpki-roots"] } clap = { workspace = true, features = ["derive", "env"] } serde = { workspace = true } serde_json = { workspace = true } @@ -98,7 +98,7 @@ md-5 = "0.10" tower = { workspace = true, features = ["util"] } wiremock = "0.6" reqwest = { version = "0.12", default-features = false, features = ["stream", "rustls-tls", "http2", "json"] } -tokio-tungstenite = { version = "0.24", default-features = false, features = ["connect", "rustls-tls-webpki-roots"] } +tokio-tungstenite = { version = "0.30", default-features = false, features = ["connect", "rustls-tls-webpki-roots"] } futures-util = "0.3" tokio = { workspace = true, features = ["macros", "rt-multi-thread", "signal", "net", "io-util", "time", "test-util", "process"] } hyper = { version = "1", features = ["server", "http1", "http2"] } diff --git a/crates/headroom-proxy/src/websocket.rs b/crates/headroom-proxy/src/websocket.rs index c3a6358c6..509cd6bfd 100644 --- a/crates/headroom-proxy/src/websocket.rs +++ b/crates/headroom-proxy/src/websocket.rs @@ -218,10 +218,10 @@ async fn run_ws_pump( fn ax_to_tg(m: AxMsg) -> Option { Some(match m { - AxMsg::Text(t) => TgMsg::Text(t.to_string()), - AxMsg::Binary(b) => TgMsg::Binary(b.to_vec()), - AxMsg::Ping(p) => TgMsg::Ping(p.to_vec()), - AxMsg::Pong(p) => TgMsg::Pong(p.to_vec()), + AxMsg::Text(t) => TgMsg::Text(t.to_string().into()), + AxMsg::Binary(b) => TgMsg::Binary(b.to_vec().into()), + AxMsg::Ping(p) => TgMsg::Ping(p.to_vec().into()), + AxMsg::Pong(p) => TgMsg::Pong(p.to_vec().into()), AxMsg::Close(Some(cf)) => TgMsg::Close(Some(TgCloseFrame { code: tokio_tungstenite::tungstenite::protocol::frame::coding::CloseCode::from(cf.code), reason: cf.reason.to_string().into(), diff --git a/crates/headroom-proxy/tests/integration_ws.rs b/crates/headroom-proxy/tests/integration_ws.rs index 7f9688d87..1c29aaf3a 100644 --- a/crates/headroom-proxy/tests/integration_ws.rs +++ b/crates/headroom-proxy/tests/integration_ws.rs @@ -53,7 +53,7 @@ async fn ws_text_and_binary_round_trip() { for i in 0..5 { let m = format!("hello-{i}"); - ws.send(Message::Text(m.clone())).await.unwrap(); + ws.send(Message::Text(m.clone().into())).await.unwrap(); let echoed = ws.next().await.unwrap().unwrap(); match echoed { Message::Text(t) => assert_eq!(t.as_str(), m), @@ -62,7 +62,7 @@ async fn ws_text_and_binary_round_trip() { } for i in 0..5u8 { let m: Vec = (0..32u8).map(|b| b ^ i).collect(); - ws.send(Message::Binary(m.clone())).await.unwrap(); + ws.send(Message::Binary(m.clone().into())).await.unwrap(); let echoed = ws.next().await.unwrap().unwrap(); match echoed { Message::Binary(b) => assert_eq!(b.to_vec(), m),