zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-19 18:41:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade async-tungstenite to v0.23 (#15220)

Browse Source 
This PR upgrades `async-tungstenite` to v0.23.

This is so we can get the CVE fix in `tungstenite` v0.20.1.

Now that #15219 is done, upgrading to v0.23 no longer breaks
authentication with collab.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-07-25 16:11:01 -04:00 committed by GitHub
parent 9d736fe80c
commit f291677d40
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Cargo.lock generated
View File

@ -661,18 +661,6 @@ dependencies = [
"pin-project-lite",
]
[[package]]
name = "async-native-tls"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d57d4cec3c647232e1094dc013546c0b33ce785d8aeb251e1f20dfaf8a9a13fe"
dependencies = [
"futures-util",
"native-tls",
"thiserror",
"url",
]
[[package]]
name = "async-native-tls"
version = "0.5.0"
@ -876,17 +864,17 @@ dependencies = [
[[package]]
name = "async-tungstenite"
version = "0.17.2"
version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1b71b31561643aa8e7df3effe284fa83ab1a840e52294c5f4bd7bfd8b2becbb"
checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc"
dependencies = [
"async-native-tls 0.4.0",
"async-native-tls",
"async-std",
"futures-io",
"futures-util",
"log",
"pin-project-lite",
"tungstenite 0.17.3",
"tungstenite",
]
[[package]]
@ -2317,7 +2305,7 @@ name = "client"
version = "0.1.0"
dependencies = [
"anyhow",
"async-native-tls 0.5.0",
"async-native-tls",
"async-recursion 0.3.2",
"async-tungstenite",
"chrono",
@ -9634,17 +9622,6 @@ dependencies = [
"workspace",
]
[[package]]
name = "sha-1"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
dependencies = [
"cfg-if",
"cpufeatures",
"digest 0.10.7",
]
[[package]]
name = "sha1"
version = "0.10.6"
@ -11204,7 +11181,7 @@ dependencies = [
"futures-util",
"log",
"tokio",
"tungstenite 0.20.1",
"tungstenite",
]
[[package]]
@ -11675,26 +11652,6 @@ version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8"
[[package]]
name = "tungstenite"
version = "0.17.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
dependencies = [
"base64 0.13.1",
"byteorder",
"bytes 1.5.0",
"http 0.2.9",
"httparse",
"log",
"native-tls",
"rand 0.8.5",
"sha-1",
"thiserror",
"url",
"utf-8",
]
[[package]]
name = "tungstenite"
version = "0.20.1"
@ -11707,6 +11664,7 @@ dependencies = [
"http 0.2.9",
"httparse",
"log",
"native-tls",
"rand 0.8.5",
"sha1",
"thiserror",

2
Cargo.toml
View File

@ -296,7 +296,7 @@ async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "8
async-recursion = "1.0.0"
async-tar = "0.4.2"
async-trait = "0.1"
async-tungstenite = { version = "0.17" }
async-tungstenite = { version = "0.23" }
async-watch = "0.3.1"
async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
base64 = "0.13"