auth: bypass ambient proxies by default; UU_USE_PROXY=1 opts in (#52)

A local HTTP/SOCKS proxy that intercepts TLS caused login to fail with
"tls handshake eof". Build all cloud API clients with no_proxy() unless
UU_USE_PROXY is explicitly truthy, so direct connections are the default
and environments that genuinely need a proxy can still enable it.
This commit is contained in:
aresbit authored and GitHub committed 2026-10-19 10:25:58 +08:00
1 parent 70cb5ad57e
commit 6416f75b7f
5 files changed
+26 -2

No files matched your search

+22 -1
View File
@@ -121,9 +121,24 @@ fn redact_urls(text: &str) -> String {
out
}
/// Cloud API clients ignore ambient HTTP/SOCKS proxy settings by default: a local
/// proxy that intercepts TLS breaks login and signaling. `UU_USE_PROXY=1` opts back
/// into reqwest's standard proxy environment handling.
pub fn http_client_builder() -> reqwest::ClientBuilder {
let builder = reqwest::Client::builder();
if std::env::var("UU_USE_PROXY").ok().as_deref().is_some_and(proxy_requested) {
builder
} else {
builder.no_proxy()
}
}
fn proxy_requested(value: &str) -> bool {
matches!(value.trim().to_ascii_lowercase().as_str(), "1" | "true" | "yes" | "on")
}
impl UUAuthClient {
pub fn new(creds: Credentials) -> Self {
let http = reqwest::Client::builder()
let http = http_client_builder()
.timeout(std::time::Duration::from_secs(12))
.build()
.unwrap();
@@ -346,4 +361,10 @@ mod guest_tests {
let text = super::redact_urls("proxy http://user:[email protected]:3128 failed for (https://api.example/p?token=abc)");
assert_eq!(text, "proxy http://proxy.example:3128 failed for (https://api.example/p)");
}
#[test]
fn proxy_opt_in_accepts_only_explicit_truthy_values() {
for value in ["1", "true", "TRUE", " yes ", "On"] { assert!(super::proxy_requested(value)); }
for value in ["", "0", "false", "no", "off", "2"] { assert!(!super::proxy_requested(value)); }
}
}
+1 -1
View File
@@ -93,7 +93,7 @@ pub struct Api {
}
impl Api {
pub fn new(signer: UUAuthClient, base: &str) -> Self {
Self { signer, base: base.trim_end_matches('/').into(), http: reqwest::Client::builder().timeout(Duration::from_secs(12)).build().unwrap() }
Self { signer, base: base.trim_end_matches('/').into(), http: crate::auth::http_client_builder().timeout(Duration::from_secs(12)).build().unwrap() }
}
pub async fn join_share(&self, connect_id: &str, connect_code: &str) -> Result<JoinData, Error> {
if connect_id.trim().is_empty() || connect_code.trim().is_empty() || connect_id.chars().chain(connect_code.chars()).any(char::is_control) { return Err(Error::InvalidAssist); }