Skip to content

Commit

Permalink
Add E2E test of CVE-2019-14899 mitigation
Browse files Browse the repository at this point in the history
  • Loading branch information
hulthe committed Jul 16, 2024
1 parent 28a3776 commit 71ef470
Show file tree
Hide file tree
Showing 11 changed files with 469 additions and 68 deletions.
96 changes: 35 additions & 61 deletions test/Cargo.lock

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

6 changes: 5 additions & 1 deletion test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,31 +47,35 @@ tokio = { version = "1.8", features = [
"rt-multi-thread",
] }
tokio-serial = "5.4.1"

# Serde and related crates
serde = "1.0"
serde_json = "1.0"
tokio-serde = { version = "0.8.0", features = ["json"] }

# Tonic and related crates
tonic = "0.10.0"
tonic-build = { version = "0.10.0", default-features = false }
tower = "0.4"
prost = "0.12.0"
prost-types = "0.12.0"
tarpc = { version = "0.30", features = ["tokio1", "serde-transport", "serde1"] }

# Logging
env_logger = "0.11.0"
thiserror = "1.0.57"
log = "0.4"
colored = "2.0.0"

# Proxy protocols
shadowsocks = { version = "1.16" }
shadowsocks-service = { version = "1.16" }

windows-sys = "0.52.0"

chrono = { version = "0.4.26", default-features = false }
clap = { version = "4.2.7", features = ["cargo", "derive"] }
once_cell = "1.16.0"
bytes = "1.3.0"
async-trait = "0.1.58"
surge-ping = "0.8"
nix = { version = "0.29", features = ["ioctl", "socket", "net"] }
6 changes: 4 additions & 2 deletions test/test-manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ tokio-serde = { workspace = true }
log = { workspace = true }

pcap = { version = "1.3", features = ["capture-stream"] }
pnet_packet = "0.31.0"
pnet_packet = "0.34.0"
pnet_base = "0.34.0"

test-rpc = { path = "../test-rpc" }
socks-server = { path = "../socks-server" }
Expand All @@ -59,7 +60,8 @@ talpid-types = { path = "../../talpid-types" }

ssh2 = "0.9.4"

nix = { version = "0.25", features = ["net"] }
nix = { workspace = true }
socket2 = "0.5.6"

[target.'cfg(target_os = "macos")'.dependencies]
tun = "0.5.1"
Expand Down
Loading

0 comments on commit 71ef470

Please sign in to comment.