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 EDED683C2 for ; Fri, 3 Mar 2023 12:39:34 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CE49DD957 for ; Fri, 3 Mar 2023 12:39:34 +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 ; Fri, 3 Mar 2023 12:39:34 +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 CA56146E20 for ; Fri, 3 Mar 2023 12:39:33 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Fri, 3 Mar 2023 12:39:21 +0100 Message-Id: <20230303113924.389256-2-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230303113924.389256-1-f.gruenbichler@proxmox.com> References: <20230303113924.389256-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.124 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 Subject: [pbs-devel] [PATCH proxmox 1/4] http: sync: set user-agent via ureq 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: Fri, 03 Mar 2023 11:39:35 -0000 this allows us to slim down our code, and once https://github.com/algesten/ureq/pull/597 is merged upstream (and/or we update to a version containing the fix) it also means the custom user agent is used for requests to the proxy host, if one is configured. Signed-off-by: Fabian Grünbichler --- proxmox-http/src/client/sync.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/proxmox-http/src/client/sync.rs b/proxmox-http/src/client/sync.rs index 41b9c79..9465d8e 100644 --- a/proxmox-http/src/client/sync.rs +++ b/proxmox-http/src/client/sync.rs @@ -22,6 +22,14 @@ impl Client { fn agent(&self) -> Result { let mut builder = ureq::AgentBuilder::new(); + + builder = builder.user_agent( + self.options + .user_agent + .as_deref() + .unwrap_or(DEFAULT_USER_AGENT_STRING), + ); + if let Some(proxy_config) = &self.options.proxy_config { builder = builder.proxy(ureq::Proxy::new(proxy_config.to_proxy_string()?)?); } -- 2.30.2