From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 7A4161FF0AF for ; Thu, 08 Oct 2026 17:33:39 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 252CB214D0; Thu, 08 Oct 2026 17:33:39 +0200 (CEST) From: Samuel Rufinatscha To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-datacenter-manager 1/1] fix #6173: acme: use the configured HTTP proxy Date: Thu, 8 Oct 2026 17:33:22 +0200 Message-ID: <20261008153323.293158-5-s.rufinatscha@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261008153323.293158-1-s.rufinatscha@proxmox.com> References: <20261008153323.293158-1-s.rufinatscha@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1791473608278 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.235 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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: DLNH4DEDBWBGXYMDFW7OQDM6EFBPFJEL X-Message-ID-Hash: DLNH4DEDBWBGXYMDFW7OQDM6EFBPFJEL X-MailFrom: s.rufinatscha@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: ACME requests ignore the node's HTTP proxy setting and fail when the CA is reachable only through a proxy. Pass the node proxy configuration to each ACME operation that contacts the CA. Link: https://bugzilla.proxmox.com/show_bug.cgi?id=6173 Signed-off-by: Samuel Rufinatscha --- cli/admin/src/acme.rs | 4 +++- server/src/api/config/acme.rs | 26 ++++++++++++++++++++------ server/src/api/nodes/certificates.rs | 9 +++++++-- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/cli/admin/src/acme.rs b/cli/admin/src/acme.rs index e61bb1ef..28a29769 100644 --- a/cli/admin/src/acme.rs +++ b/cli/admin/src/acme.rs @@ -146,7 +146,9 @@ async fn register_account( }; println!("Attempting to fetch Terms of Service from {directory_url:?}"); - let mut client = AcmeClient::new(directory_url.clone()); + let (node_config, _) = pdm_config::node::config()?; + let proxy_config = pdm_config::node::get_http_proxy_config(&node_config); + let mut client = AcmeClient::with_proxy(directory_url.clone(), proxy_config); let directory = client.directory().await?; let tos_agreed = if let Some(tos_url) = directory.terms_of_service_url() { println!("Terms of Service: {tos_url}"); diff --git a/server/src/api/config/acme.rs b/server/src/api/config/acme.rs index 838ad173..f852fa45 100644 --- a/server/src/api/config/acme.rs +++ b/server/src/api/config/acme.rs @@ -136,9 +136,17 @@ pub fn register_account( move |_worker| async move { proxmox_log::info!("Registering ACME account '{}'...", &name,); - let location = - proxmox_acme_api::register_account(&name, contact, tos_url, directory, eab_cread) - .await?; + let (node_config, _) = pdm_config::node::config()?; + let proxy_config = pdm_config::node::get_http_proxy_config(&node_config); + let location = proxmox_acme_api::register_account( + &name, + contact, + tos_url, + directory, + eab_cread, + proxy_config, + ) + .await?; proxmox_log::info!("Registration successful, account URL: {}", location); @@ -198,7 +206,9 @@ pub fn update_account( move |_worker| async move { proxmox_log::info!("Update ACME account '{}'...", &name,); - proxmox_acme_api::update_account(&name, contact).await?; + let (node_config, _) = pdm_config::node::config()?; + let proxy_config = pdm_config::node::get_http_proxy_config(&node_config); + proxmox_acme_api::update_account(&name, contact, proxy_config).await?; proxmox_log::info!("Update ACME account '{}' successful", &name,); @@ -243,7 +253,9 @@ pub fn deactivate_account( move |_worker| async move { proxmox_log::info!("Deactivate ACME account '{}'...", &name,); - proxmox_acme_api::deactivate_account(&name, force).await?; + let (node_config, _) = pdm_config::node::config()?; + let proxy_config = pdm_config::node::get_http_proxy_config(&node_config); + proxmox_acme_api::deactivate_account(&name, force, proxy_config).await?; proxmox_log::info!("Deactivate ACME account '{}' successful", &name,); @@ -433,5 +445,7 @@ fn get_directories() -> Result<&'static [KnownAcmeDirectory], Error> { )] /// Get the Terms of Service URL for an ACME directory. async fn get_tos(directory: Option) -> Result, Error> { - proxmox_acme_api::get_tos(directory).await + let (node_config, _) = pdm_config::node::config()?; + let proxy_config = pdm_config::node::get_http_proxy_config(&node_config); + proxmox_acme_api::get_tos(directory, proxy_config).await } diff --git a/server/src/api/nodes/certificates.rs b/server/src/api/nodes/certificates.rs index c3765415..753a8c0a 100644 --- a/server/src/api/nodes/certificates.rs +++ b/server/src/api/nodes/certificates.rs @@ -281,8 +281,11 @@ fn spawn_certificate_worker( WorkerTask::spawn(name, None, auth_id, true, move |worker| async move { let work = || async { + let (node_config, _) = pdm_config::node::config()?; + let proxy_config = pdm_config::node::get_http_proxy_config(&node_config); if let Some(cert) = - proxmox_acme_api::order_certificate(worker, &acme_config, &domains).await? + proxmox_acme_api::order_certificate(worker, &acme_config, &domains, proxy_config) + .await? { crate::auth::certs::set_api_certificate(&cert.certificate, &cert.private_key_pem)?; crate::reload_api_certificate().await?; @@ -336,7 +339,9 @@ pub fn revoke_acme_cert(rpcenv: &mut dyn RpcEnvironment) -> Result