Elgato_dark/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk synced 2026-04-21 13:27:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix reqwest proxy auth (#13354)

Browse source 
Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
21pages 2025-10-30 20:01:17 +08:00 committed by GitHub
parent 055826e26f
commit 0f34c50bd2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/hbb_common

@ -1 +1 @@
Subproject commit 0e382020934f204a6a525a05c9b5ce9e96518025
Subproject commit d6dd7ae052ac62f0f1538f1e056bce9429e28e33

14
src/hbbs_http/http_client.rs
View file

@ -36,19 +36,13 @@ macro_rules! configure_http_client {
};
match proxy_setup {
Ok(p) => {
builder = builder.proxy(p);
Ok(mut p) => {
if let Some(auth) = proxy.intercept.maybe_auth() {
let basic_auth =
format!("Basic {}", auth.get_basic_authorization());
if let Ok(auth) = basic_auth.parse() {
builder = builder.default_headers(
vec![(reqwest::header::PROXY_AUTHORIZATION, auth)]
.into_iter()
.collect(),
);
if !auth.username().is_empty() && !auth.password().is_empty() {
p = p.basic_auth(auth.username(), auth.password());
}
}
builder = builder.proxy(p);
builder.build().unwrap_or_else(|e| {
info!("Failed to create a proxied client: {}", e);
<$Client>::new()