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 41CC57A460 for ; Fri, 7 May 2021 12:58:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3FC1529C13 for ; Fri, 7 May 2021 12:58:33 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS id 1525629BFC for ; Fri, 7 May 2021 12:58:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5E5C94652A for ; Fri, 7 May 2021 12:53:19 +0200 (CEST) From: Dylan Whyte To: pbs-devel@lists.proxmox.com Date: Fri, 7 May 2021 12:53:02 +0200 Message-Id: <20210507105303.7793-3-d.whyte@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210507105303.7793-1-d.whyte@proxmox.com> References: <20210507105303.7793-1-d.whyte@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.150 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [maurer-it.com, subscription.rs] Subject: [pbs-devel] [PATCH proxmox-backup 3/4] fix #3296: use proxy for subscriptions 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: Fri, 07 May 2021 10:58:33 -0000 Signed-off-by: Dylan Whyte --- src/tools/subscription.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/tools/subscription.rs b/src/tools/subscription.rs index eaaf0389..55b89387 100644 --- a/src/tools/subscription.rs +++ b/src/tools/subscription.rs @@ -6,6 +6,7 @@ use regex::Regex; use proxmox::api::api; +use crate::config::node; use crate::tools::{self, http::SimpleHttp}; use proxmox::tools::fs::{replace_file, CreateOptions}; @@ -102,7 +103,13 @@ async fn register_subscription( "check_token": challenge, }); - let mut client = SimpleHttp::new(None); // TODO: pass proxy_config + let proxy_config = if let Ok((node_config, _digest)) = node::config() { + node_config.http_proxy() + } else { + None + }; + + let mut client = SimpleHttp::new(proxy_config); let uri = "https://shop.maurer-it.com/modules/servers/licensing/verify.php"; let query = tools::json_object_to_query(params)?; -- 2.20.1