From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id B3DB81FF13B for ; Wed, 11 Feb 2026 17:18:51 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 70B7732E67; Wed, 11 Feb 2026 17:19:37 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup 2/3] fix #3723: api: remote: optionally use node proxy config for http client Date: Wed, 11 Feb 2026 17:18:44 +0100 Message-ID: <20260211161845.1006528-4-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260211161845.1006528-1-c.ebner@proxmox.com> References: <20260211161845.1006528-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1770826656027 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.046 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: JRG7PGU5SCH4IM7W37TCUIUELFDCWOOH X-Message-ID-Hash: JRG7PGU5SCH4IM7W37TCUIUELFDCWOOH X-MailFrom: c.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Allow to use the node's http proxy config if the new `use-node-proxy` flag is set in the remote config. If ever required, it is still possible to extend this to allow for custom proxy settings on the remote. Fixes: https://bugzilla.proxmox.com/show_bug.cgi?id=3723 Signed-off-by: Christian Ebner --- src/api2/config/remote.rs | 13 +++++++++++++ src/config/node.rs | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/src/api2/config/remote.rs b/src/api2/config/remote.rs index 0a0996e25..1996ee91b 100644 --- a/src/api2/config/remote.rs +++ b/src/api2/config/remote.rs @@ -142,6 +142,8 @@ pub enum DeletableProperty { Fingerprint, /// Delete the port property. Port, + /// Delete the use_node_proxy property. + UseNodeProxy, } #[api( @@ -209,6 +211,9 @@ pub fn update_remote( DeletableProperty::Port => { data.config.port = None; } + DeletableProperty::UseNodeProxy => { + data.config.use_node_proxy = None; + } } } } @@ -238,6 +243,10 @@ pub fn update_remote( data.config.fingerprint = update.fingerprint; } + if update.use_node_proxy.is_some() { + data.config.use_node_proxy = update.use_node_proxy; + } + config.set_data(&name, "remote", &data)?; pbs_config::remote::save_config(&config)?; @@ -310,6 +319,10 @@ pub fn remote_client_config( if let Some(limit) = limit { options = options.rate_limit(limit); } + if remote.config.use_node_proxy.unwrap_or(false) { + let proxy = crate::config::node::node_http_proxy_config()?; + options = options.proxy(proxy); + } let client = HttpClient::new( &remote.config.host, diff --git a/src/config/node.rs b/src/config/node.rs index 81eecb247..a79bf5707 100644 --- a/src/config/node.rs +++ b/src/config/node.rs @@ -309,3 +309,8 @@ impl Iterator for AcmeDomainIter<'_> { )) } } + +pub(crate) fn node_http_proxy_config() -> Result, Error> { + let (node_config, _digest) = self::config()?; + Ok(node_config.http_proxy()) +} -- 2.47.3