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 9BD677AA5D for ; Mon, 10 May 2021 09:25:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9242514634 for ; Mon, 10 May 2021 09:25:21 +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 240FE14626 for ; Mon, 10 May 2021 09:25:21 +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 EF7A9459E3 for ; Mon, 10 May 2021 09:25:20 +0200 (CEST) To: Proxmox Backup Server development discussion , Dylan Whyte References: <20210507105303.7793-1-d.whyte@proxmox.com> <20210507105303.7793-4-d.whyte@proxmox.com> From: Dietmar Maurer Message-ID: <5841804e-b619-fdea-1b6c-32b2ad9e31e1@proxmox.com> Date: Mon, 10 May 2021 09:25:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <20210507105303.7793-4-d.whyte@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-SPAM-LEVEL: Spam detection results: 0 AWL 0.222 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 Subject: [pbs-devel] applied: [PATCH proxmox-backup 4/4] fix #3296: use proxy client to retrieve changelog 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: Mon, 10 May 2021 07:25:51 -0000 applied On 5/7/21 12:53 PM, Dylan Whyte wrote: > Signed-off-by: Dylan Whyte > --- > src/api2/node/apt.rs | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/src/api2/node/apt.rs b/src/api2/node/apt.rs > index 44b13edd..96a0f530 100644 > --- a/src/api2/node/apt.rs > +++ b/src/api2/node/apt.rs > @@ -6,6 +6,7 @@ use proxmox::list_subdirs_api_method; > use proxmox::api::{api, RpcEnvironment, RpcEnvironmentType, Permission}; > use proxmox::api::router::{Router, SubdirMap}; > > +use crate::config::node; > use crate::server::WorkerTask; > use crate::tools::{apt, http::SimpleHttp, subscription}; > > @@ -194,7 +195,13 @@ fn apt_get_changelog( > bail!("Package '{}' not found", name); > } > > - 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 changelog_url = &pkg_info[0].change_log_url; > // FIXME: use 'apt-get changelog' for proxmox packages as well, once repo supports it