From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 26AE793188 for ; Thu, 15 Sep 2022 16:17:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1A1501A8E6 for ; Thu, 15 Sep 2022 16:16:55 +0200 (CEST) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Thu, 15 Sep 2022 16:16:53 +0200 (CEST) Received: by lana.proxmox.com (Postfix, from userid 10043) id 452BF2C1F8A; Thu, 15 Sep 2022 16:08:58 +0200 (CEST) From: Stefan Hanreich To: pbs-devel@lists.proxmox.com Date: Thu, 15 Sep 2022 16:08:57 +0200 Message-Id: <20220915140857.1041222-1-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.000 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup] fix #4095: make http client read proxy config from envvars X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Sep 2022 14:17:25 -0000 In order to be able to use a proxy with the proxmox-backup-client, use ProxyConfig for parsing proxy server config from the environment. Also added a section in the documentation that describes how to configure the environment if a proxy server should be used. Signed-off-by: Stefan Hanreich --- docs/backup-client.rst | 7 +++++ pbs-client/src/http_client.rs | 57 +++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/docs/backup-client.rst b/docs/backup-client.rst index cc56d17e..45efc136 100644 --- a/docs/backup-client.rst +++ b/docs/backup-client.rst @@ -69,6 +69,13 @@ Environment Variables When set, this value is used to verify the server certificate (only used if the system CA certificates cannot validate the certificate). +``ALL_PROXY`` + When set, the client uses the specified HTTP proxy for all connections to the + backup server. Currently only HTTP proxies are supported. Valid proxy + configurations have the following format: + `[http://][user:password@][:port]`. Default `port` is 1080, if not + otherwise specified. + .. Note:: Passwords must be valid UTF-8 and may not contain newlines. For your convenience, Proxmox Backup Server only uses the first line as password, so diff --git a/pbs-client/src/http_client.rs b/pbs-client/src/http_client.rs index 4ef1350b..e41d94c0 100644 --- a/pbs-client/src/http_client.rs +++ b/pbs-client/src/http_client.rs @@ -23,6 +23,7 @@ use proxmox_sys::linux::tty; use proxmox_async::broadcast_future::BroadcastFuture; use proxmox_http::client::{HttpsConnector, RateLimiter}; +use proxmox_http::ProxyConfig; use proxmox_http::uri::{build_authority, json_object_to_query}; use pbs_api_types::percent_encoding::DEFAULT_ENCODE_SET; @@ -389,6 +390,11 @@ impl HttpClient { ))))); } + let proxy_config = ProxyConfig::from_proxy_env()?; + if let Some(config) = proxy_config { + https.set_proxy(config); + } + let client = Client::builder() //.http2_initial_stream_window_size( (1 << 31) - 2) //.http2_initial_connection_window_size( (1 << 31) - 2) @@ -1083,3 +1089,54 @@ impl H2Client { Ok(request) } } + +#[cfg(test)] +mod tests { + use std::env; + use super::*; + + #[test] + fn test_proxy_config() { + env::set_var("ALL_PROXY", "https://localhost:8080"); + + let mut http_client = HttpClient::new( + "localhost", + 8888, + Authid::root_auth_id(), + HttpClientOptions::new_non_interactive( + String::from("test"), + None + ), + ); + + assert!(http_client.is_err()); + + env::set_var("ALL_PROXY", "http://localhost:8080"); + + http_client = HttpClient::new( + "localhost", + 8888, + Authid::root_auth_id(), + HttpClientOptions::new_non_interactive( + String::from("test"), + None + ), + ); + + assert!(http_client.is_ok()); + + env::remove_var("ALL_PROXY"); + + http_client = HttpClient::new( + "localhost", + 8888, + Authid::root_auth_id(), + HttpClientOptions::new_non_interactive( + String::from("test"), + None + ), + ); + + assert!(http_client.is_ok()); + } +} \ No newline at end of file -- 2.30.2