fix(connlib): revert "build(deps): Bump tokio-tungstenite from 0.21.0 to 0.23.0 in /rust" (#5379)

Reverts firezone/firezone#5290

This updates caused panics in macos, and [turns out it might cause
gateways and relays to
panic](https://github.com/firezone/firezone/pull/5290#issuecomment-2168642981)
This commit is contained in:
Gabi
2024-06-14 19:58:12 -03:00
committed by GitHub
parent 6e5b351277
commit 847c61bc99
4 changed files with 16 additions and 39 deletions

49
rust/Cargo.lock generated
View File

@@ -2989,10 +2989,10 @@ dependencies = [
"http 1.1.0",
"hyper 1.2.0",
"hyper-util",
"rustls 0.22.4",
"rustls",
"rustls-pki-types",
"tokio",
"tokio-rustls 0.25.0",
"tokio-rustls",
"tower-service",
]
@@ -5181,7 +5181,7 @@ dependencies = [
"once_cell",
"percent-encoding",
"pin-project-lite",
"rustls 0.22.4",
"rustls",
"rustls-pemfile",
"rustls-pki-types",
"serde",
@@ -5189,7 +5189,7 @@ dependencies = [
"serde_urlencoded",
"sync_wrapper 0.1.2",
"tokio",
"tokio-rustls 0.25.0",
"tokio-rustls",
"tokio-util",
"tower-service",
"url",
@@ -5330,19 +5330,6 @@ dependencies = [
"zeroize",
]
[[package]]
name = "rustls"
version = "0.23.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebbbdb961df0ad3f2652da8f3fdc4b36122f568f968f45ad3316f26c025c677b"
dependencies = [
"once_cell",
"rustls-pki-types",
"rustls-webpki",
"subtle",
"zeroize",
]
[[package]]
name = "rustls-pemfile"
version = "2.1.2"
@@ -6599,18 +6586,7 @@ version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
dependencies = [
"rustls 0.22.4",
"rustls-pki-types",
"tokio",
]
[[package]]
name = "tokio-rustls"
version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
dependencies = [
"rustls 0.23.7",
"rustls",
"rustls-pki-types",
"tokio",
]
@@ -6628,16 +6604,16 @@ dependencies = [
[[package]]
name = "tokio-tungstenite"
version = "0.23.0"
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "becd34a233e7e31a3dbf7c7241b38320f57393dcae8e7324b0167d21b8e320b0"
checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
dependencies = [
"futures-util",
"log",
"rustls 0.23.7",
"rustls",
"rustls-pki-types",
"tokio",
"tokio-rustls 0.26.0",
"tokio-rustls",
"tungstenite",
"webpki-roots",
]
@@ -6987,9 +6963,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "tungstenite"
version = "0.23.0"
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8"
checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
dependencies = [
"byteorder",
"bytes",
@@ -6998,10 +6974,11 @@ dependencies = [
"httparse",
"log",
"rand 0.8.5",
"rustls 0.23.7",
"rustls",
"rustls-pki-types",
"sha1",
"thiserror",
"url",
"utf-8",
]

View File

@@ -34,7 +34,7 @@ str0m = { version = "0.5", default-features = false }
futures-bounded = "0.2.1"
domain = { version = "0.10", features = ["serde"] }
dns-lookup = "2.0"
tokio-tungstenite = "0.23"
tokio-tungstenite = "0.21"
rtnetlink = { version = "0.14.1", default-features = false, features = ["tokio_socket"] }
connlib-client-android = { path = "connlib/clients/android"}

View File

@@ -21,7 +21,7 @@ serde = { version = "1.0", default-features = false, features = ["std", "derive"
backoff = { workspace = true }
url = { version = "2.4.1", features = ["serde"] }
time = { version = "0.3.36", features = ["formatting"] }
tokio-tungstenite = { version = "0.23", default-features = false, features = ["connect", "handshake", "rustls-tls-webpki-roots"] }
tokio-tungstenite = { version = "0.21", default-features = false, features = ["connect", "handshake", "rustls-tls-webpki-roots"] }
bimap = "0.6"
ip_network = { version = "0.4", default-features = false }
phoenix-channel = { workspace = true }

View File

@@ -22,7 +22,7 @@ phoenix-channel = { workspace = true }
secrecy = { workspace = true }
serde = { version = "1.0", default-features = false, features = ["std", "derive"] }
tokio = { version = "1.38", default-features = false, features = ["sync", "macros", "rt-multi-thread", "fs", "signal"] }
tokio-tungstenite = { version = "0.23", default-features = false, features = ["connect", "handshake", "rustls-tls-webpki-roots"] }
tokio-tungstenite = { version = "0.21", default-features = false, features = ["connect", "handshake", "rustls-tls-webpki-roots"] }
tracing = { workspace = true }
tracing-subscriber = "0.3.17"
url = { version = "2.4.1", default-features = false }