From a28800ba443dc27e80b94ccd99da54926853b12d Mon Sep 17 00:00:00 2001 From: VallierDev <24893073+VallierDev@users.noreply.github.com> Date: Fri, 16 Oct 2026 12:27:19 +0800 Subject: [PATCH] Trust system certificates and show transport error causes (#21) reqwest used only the bundled webpki roots, so TLS-intercepting proxies with a custom CA (SSL_CERT_FILE) failed with a bare "error sending request". Enable native roots (rustls-native-certs honors SSL_CERT_FILE and SSL_CERT_DIR) and report the error source chain with URL user-info and query strings removed. Release v0.1.20. Co-Authored-By: Claude Opus 5.5 --- Cargo.lock | 70 ++++++++++++++++++++++++++++++++++- Cargo.toml | 4 +- docs/release-notes/v0.1.20.md | 16 ++++++++ src/auth.rs | 40 +++++++++++++++++++- 4 files changed, 125 insertions(+), 5 deletions(-) create mode 100644 docs/release-notes/v0.1.20.md diff --git a/Cargo.lock b/Cargo.lock index b6bebf0..2eae5aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -382,6 +382,22 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "core-foundation" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + [[package]] name = "cpufeatures" version = "0.2.17" @@ -969,6 +985,7 @@ dependencies = [ "hyper", "hyper-util", "rustls 0.23.45", + "rustls-native-certs", "tokio", "tokio-rustls", "tower-service", @@ -1417,6 +1434,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" +[[package]] +name = "openssl-probe" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" + [[package]] name = "p256" version = "0.13.2" @@ -1797,6 +1820,7 @@ dependencies = [ "pin-project-lite", "quinn", "rustls 0.23.45", + "rustls-native-certs", "rustls-pki-types", "serde", "serde_json", @@ -1946,6 +1970,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-native-certs" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d" +dependencies = [ + "openssl-probe", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pki-types" version = "1.15.1" @@ -1989,6 +2025,15 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" +[[package]] +name = "schannel" +version = "0.1.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939" +dependencies = [ + "windows-sys 0.61.2", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -2031,6 +2076,29 @@ dependencies = [ "zeroize", ] +[[package]] +name = "security-framework" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" +dependencies = [ + "bitflags 2.13.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "semver" version = "1.0.28" @@ -2649,7 +2717,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uu-remote-linux" -version = "0.1.19" +version = "0.1.20" dependencies = [ "async-trait", "base64 0.22.1", diff --git a/Cargo.toml b/Cargo.toml index 1c441e3..a7aecb4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu-remote-linux" -version = "0.1.19" +version = "0.1.20" edition = "2021" authors = ["uu-remote-linux contributors"] description = "Unofficial Linux host for NetEase UU Remote: control a Linux desktop from the official clients" @@ -29,7 +29,7 @@ tokio-tungstenite = { version = "0.23", features = ["rustls-tls-webpki-roots"] } futures-util = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] } +reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls", "rustls-tls-native-roots"] } hmac = "0.12" sha2 = "0.10" hex = "0.4" diff --git a/docs/release-notes/v0.1.20.md b/docs/release-notes/v0.1.20.md new file mode 100644 index 0000000..257bff1 --- /dev/null +++ b/docs/release-notes/v0.1.20.md @@ -0,0 +1,16 @@ +登录诊断与系统证书支持。/ Login diagnostics and system certificate support. + +### 修复 / Fixed +- **企业代理 / 自定义 CA 环境下登录失败**(#21,感谢 @liuji10000qian-svg):除内置根证书外,现在也信任系统证书库, + 并遵循 `SSL_CERT_FILE` / `SSL_CERT_DIR`。会做 TLS 拦截的代理(使用自签 CA)此前会导致设备注册请求失败。 + Trust the system certificate store and honor `SSL_CERT_FILE` / `SSL_CERT_DIR` in addition to the bundled roots. +- **网络请求失败时只显示「error sending request」**:错误信息现在包含底层原因链(证书、代理、DNS、超时等), + 并去掉 URL 中的用户名密码(如代理凭据)和查询参数。 + Transport errors now include their cause chain, with URL credentials and query strings removed. + +⚠️ 自定义 CA / 代理环境未实测,请在 #21 反馈新版本的错误信息。 + +### 下载 / Download +`uu-remote-linux-v0.1.20-x86_64-linux.tar.gz`:X11 版可执行文件(x86_64,glibc ≥ 2.35),附带 `contrib/`。 + +**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.** diff --git a/src/auth.rs b/src/auth.rs index 1a35134..947aa9a 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -91,6 +91,36 @@ pub struct UUAuthClient { guest_id: Option, } +/// Transport failures name only the outer request; the cause (certificate, proxy, DNS, +/// timeout) lives in the source chain. URL user-info (proxy credentials) and query +/// strings are removed before the chain is shown. +pub fn transport_error(error: &(dyn std::error::Error + 'static)) -> String { + let mut parts = vec![error.to_string()]; + let mut source = error.source(); + while let Some(cause) = source { + let text = cause.to_string(); + if parts.last() != Some(&text) { parts.push(text); } + source = cause.source(); + if parts.len() >= 8 { break; } + } + redact_urls(&parts.join(": ")) +} +fn redact_urls(text: &str) -> String { + let mut out = String::with_capacity(text.len()); + let mut rest = text; + while let Some(i) = rest.find("://") { + let (head, tail) = rest.split_at(i + 3); + out.push_str(head); + let end = tail.find(|c: char| c.is_whitespace() || c == ')' || c == '"' || c == '\'').unwrap_or(tail.len()); + let url = &tail[..end]; + let url = url.rsplit_once('@').map_or(url, |(_, host)| host); + out.push_str(url.split(['?', '#']).next().unwrap_or("")); + rest = &tail[end..]; + } + out.push_str(rest); + out +} + impl UUAuthClient { pub fn new(creds: Credentials) -> Self { let http = reqwest::Client::builder() @@ -200,7 +230,7 @@ impl UUAuthClient { let body_str = serde_json::to_string(body).map_err(|e| e.to_string())?; let resp = self.http.post(format!("{}{}", BASE_URL, path)) .headers(self.build_headers("POST", path, &body_str)).body(body_str) - .send().await.map_err(|e| format!("HTTP post {path} failed: {e}"))?; + .send().await.map_err(|e| format!("HTTP post {path} failed: {}", transport_error(&e)))?; let status = resp.status().as_u16(); let value = resp.json().await.unwrap_or(serde_json::Value::Null); Ok((status, value)) @@ -219,7 +249,7 @@ impl UUAuthClient { } async fn assist_send(&self, request: reqwest::Request) -> Result<(u16, serde_json::Value), String> { let response = self.http.execute(request) - .await.map_err(|_| "assist request transport failed")?; + .await.map_err(|e| format!("assist request transport failed: {}", transport_error(&e)))?; let status = response.status().as_u16(); let bytes = response.bytes().await.map_err(|_| "assist response read failed")?; if bytes.len() > 65536 { return Err("assist response too large".into()); } @@ -310,4 +340,10 @@ mod guest_tests { let mut without_guest = params; without_guest.remove("x-param-guest-id"); assert_ne!(headers["x-param-sign"], client.sign_request("POST", "/api/v1/guest/room/create", &without_guest, "")); } + + #[test] + fn transport_error_redacts_proxy_credentials_and_queries() { + let text = super::redact_urls("proxy http://user:secret@proxy.example:3128 failed for (https://api.example/p?token=abc)"); + assert_eq!(text, "proxy http://proxy.example:3128 failed for (https://api.example/p)"); + } }