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 E22BD8D05 for ; Tue, 7 Mar 2023 09:43:53 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C8DC197DA for ; Tue, 7 Mar 2023 09:43:53 +0100 (CET) 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 for ; Tue, 7 Mar 2023 09:43:53 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D6AF941B34 for ; Tue, 7 Mar 2023 09:43:52 +0100 (CET) Date: Tue, 7 Mar 2023 09:43:51 +0100 From: Wolfgang Bumiller To: Fabian =?utf-8?Q?Gr=C3=BCnbichler?= Cc: pbs-devel@lists.proxmox.com Message-ID: <20230307084351.vjspkzd5idjijlj7@fwblub> References: <20230303114055.539698-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230303114055.539698-1-f.gruenbichler@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.183 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 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. [mirror.rs, subscription.rs] Subject: Re: [pbs-devel] [PATCH proxmox-offline-mirror] actually include version in user-agent 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: Tue, 07 Mar 2023 08:43:53 -0000 On Fri, Mar 03, 2023 at 12:40:55PM +0100, Fabian Grünbichler wrote: > as originally intended. > > Signed-off-by: Fabian Grünbichler > --- > if desired, could use option_env + a fallback to some unknown version string > (that code path would only trigger if rustc is manually invoked, not via cargo) > > src/mirror.rs | 5 ++++- > src/subscription.rs | 7 ++++--- > 2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/src/mirror.rs b/src/mirror.rs > index 787e223..cd98e3b 100644 > --- a/src/mirror.rs > +++ b/src/mirror.rs > @@ -63,7 +63,10 @@ impl TryInto for MirrorConfig { > let key = file_get_contents(Path::new(&self.key_path))?; > > let options = HttpOptions { > - user_agent: Some("proxmox-offline-mirror 0.1".to_string()), > + user_agent: Some(format!( > + "proxmox-offline-mirror/{}", > + env!("CARGO_PKG_VERSION") > + )), > proxy_config: ProxyConfig::from_proxy_env()?, > ..Default::default() > }; // TODO actually read version ;) > diff --git a/src/subscription.rs b/src/subscription.rs > index d186a95..8e3fa51 100644 > --- a/src/subscription.rs > +++ b/src/subscription.rs > @@ -12,12 +12,13 @@ use crate::{config::SubscriptionKey, types::ProductType}; > > // TODO: Update with final, public URL > const PRODUCT_URL: &str = "-"; > -// TODO add version? > -const USER_AGENT: &str = "proxmox-offline-mirror"; > > fn client() -> Result { > let options = HttpOptions { > - user_agent: Some(USER_AGENT.to_string()), > + user_agent: Some(format!( > + "proxmox-offline-mirror/{}", > + env!("CARGO_PKG_VERSION") > + )), Could do `concat!(...).to_string()`. (Unfortunately still need the actual `String` here...) > proxy_config: ProxyConfig::from_proxy_env()?, > ..Default::default() > }; > -- > 2.30.2