Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update tungstenite to remove RUSTSEC warning #5200

Merged
merged 4 commits into from
Feb 15, 2024
Merged

Update tungstenite to remove RUSTSEC warning #5200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85a2581
Update to tungstenite 0.20
emilk Feb 15, 2024
b40d352
Update ureq
emilk Feb 15, 2024
66a5a2d
tweak
emilk Feb 15, 2024
029e679
Update deny.toml
emilk Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 53 additions & 48 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ time = { version = "0.3", default-features = false, features = [
tinyvec = { version = "1.6", features = ["alloc", "rustc_1_55"] }
tobj = "4.0"
tokio = { version = "1.24", default-features = false }
tokio-tungstenite = { version = "0.17.1", default-features = false }
tokio-tungstenite = { version = "0.20.0", default-features = false }
toml = { version = "0.7.8", default-features = false }
tracing = { version = "0.1", default-features = false }
tungstenite = { version = "0.17", default-features = false }
tungstenite = { version = "0.20", default-features = false }
type-map = "0.5"
typenum = "1.15"
unindent = "0.2"
Expand Down
4 changes: 3 additions & 1 deletion crates/re_ws_comms/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ futures-util = { workspace = true, optional = true, default-features = false, fe
"std",
] }
parking_lot = { workspace = true, optional = true }
tokio-tungstenite = { workspace = true, optional = true }
tokio-tungstenite = { workspace = true, optional = true, features = [
"handshake",
] }
tokio = { workspace = true, optional = true, features = [
"io-std",
"macros",
Expand Down
6 changes: 2 additions & 4 deletions deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ targets = [
vulnerability = "deny"
unmaintained = "warn"
yanked = "deny"
ignore = [
"RUSTSEC-2023-0052", # https://rustsec.org/advisories/RUSTSEC-2023-0052 - webpki: CPU denial of service in certificate path building - can be fixed by `cargo update -p ureq`, but then we run into duplicate crates: https://github.com/algesten/ureq/issues/653
"RUSTSEC-2023-0065", # https://rustsec.org/advisories/RUSTSEC-2023-0065 - Tungstenite WebSocket server can be DOS-attacked by malicious clients
]
ignore = []

[bans]
multiple-versions = "deny"
Expand All @@ -56,6 +53,7 @@ skip = [
{ name = "raw-window-handle" }, # Pretty small crate; some crates still on old version
{ name = "redox_syscall" }, # Plenty of versions in the wild
{ name = "spin" }, # Old version used by rusttls
{ name = "webpki-roots" }, # ureq and tungstenite are on different version 😭
{ name = "windows" }, # Old version used by accesskit_windows, newer version used by wgpu
]
skip-tree = [
Expand Down
Loading