Eric Holk
414e6fe31e
This consolidates the proxy code in `client/src/proxy` into a new `proxy_handshake` crate that implements the client side of HTTP CONNECT and SOCKS4/4a/5/5h handshakes sans-IO: the protocol logic is a pure state machine that never touches a socket, with thin drivers behind `futures-io` and `tokio` feature flags. `client` now drives the websocket's proxy tunnel through the tokio driver, and the `tokio-socks` dependency goes away. The main win is testability: the handshakes are now covered by synchronous byte-level tests on both sides of each exchange, plus a property test that the outcome is invariant under how the proxy's bytes are chunked across reads — the class of partial-read bug that's hard to hit with hand-written tests but easy to hit in production behind a buffering proxy. The crate is written as if it were standalone (no zed-internal dependencies, structured errors instead of `anyhow`), which is also why it grows both driver flavors rather than just the one `client` needs today. Two deliberate behavior changes, both converging on spec/curl semantics: - Proxy credentials embedded in URLs are now percent-decoded before use, per RFC 3986 §3.2.1. Previously they were sent in their encoded form, which only worked for credentials with no reserved characters. A password that literally contains something like `%40` and relied on the old behavior now needs the RFC-correct `%2540` spelling. - `NO_PROXY` is now honored for the collaboration connection, matching the exclusions reqwest already applies to the rest of Zed's HTTP traffic. TLS to the proxy itself (for `https://` proxy URLs) and DNS policy stay in `client`, since those are I/O concerns the sans-IO crate deliberately doesn't own. Release Notes: - Improved proxy support: the collaboration connection now respects `NO_PROXY` and percent-encoded proxy credentials.
87 lines
2.6 KiB
TOML
87 lines
2.6 KiB
TOML
[package]
|
|
name = "client"
|
|
version = "0.1.0"
|
|
edition.workspace = true
|
|
publish.workspace = true
|
|
license = "GPL-3.0-or-later"
|
|
|
|
[lints]
|
|
workspace = true
|
|
|
|
[lib]
|
|
path = "src/client.rs"
|
|
doctest = false
|
|
|
|
[features]
|
|
test-support = ["clock/test-support", "collections/test-support", "gpui/test-support", "rpc/test-support"]
|
|
|
|
[dependencies]
|
|
anyhow.workspace = true
|
|
async-channel.workspace = true
|
|
async-tungstenite = { workspace = true, features = ["tokio", "tokio-rustls-manual-roots"] }
|
|
chrono = { workspace = true, features = ["serde"] }
|
|
clock.workspace = true
|
|
cloud_api_client.workspace = true
|
|
cloud_api_types.workspace = true
|
|
cloud_llm_client.workspace = true
|
|
collections.workspace = true
|
|
credentials_provider.workspace = true
|
|
derive_more.workspace = true
|
|
feature_flags.workspace = true
|
|
fs.workspace = true
|
|
futures.workspace = true
|
|
gpui.workspace = true
|
|
gpui_tokio.workspace = true
|
|
http_client.workspace = true
|
|
http_client_tls.workspace = true
|
|
log.workspace = true
|
|
parking_lot.workspace = true
|
|
paths.workspace = true
|
|
postage.workspace = true
|
|
proxy_handshake = { workspace = true, features = ["tokio"] }
|
|
rand.workspace = true
|
|
regex.workspace = true
|
|
release_channel.workspace = true
|
|
rpc = { workspace = true, features = ["gpui"] }
|
|
serde.workspace = true
|
|
serde_json.workspace = true
|
|
serde_urlencoded.workspace = true
|
|
settings.workspace = true
|
|
sha2.workspace = true
|
|
smol.workspace = true
|
|
telemetry.workspace = true
|
|
telemetry_events.workspace = true
|
|
text.workspace = true
|
|
thiserror.workspace = true
|
|
time.workspace = true
|
|
tiny_http.workspace = true
|
|
tokio.workspace = true
|
|
url.workspace = true
|
|
util.workspace = true
|
|
worktree.workspace = true
|
|
zed_credentials_provider.workspace = true
|
|
|
|
[dev-dependencies]
|
|
clock = { workspace = true, features = ["test-support"] }
|
|
collections = { workspace = true, features = ["test-support"] }
|
|
fs.workspace = true
|
|
gpui = { workspace = true, features = ["test-support"] }
|
|
http_client = { workspace = true, features = ["test-support"] }
|
|
rpc = { workspace = true, features = ["test-support"] }
|
|
settings = { workspace = true, features = ["test-support"] }
|
|
util = { workspace = true, features = ["test-support"] }
|
|
|
|
[target.'cfg(target_os = "windows")'.dependencies]
|
|
semver.workspace = true
|
|
windows.workspace = true
|
|
|
|
[target.'cfg(target_os = "macos")'.dependencies]
|
|
objc2-foundation.workspace = true
|
|
|
|
[target.'cfg(any(target_os = "windows", target_os = "macos"))'.dependencies]
|
|
tokio-native-tls = "0.3"
|
|
|
|
[target.'cfg(not(any(target_os = "windows", target_os = "macos")))'.dependencies]
|
|
rustls-pki-types = "1.12"
|
|
tokio-rustls = { version = "0.26", features = ["tls12", "ring"], default-features = false }
|