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 977FF73ADA for ; Fri, 16 Apr 2021 15:35:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0575924C45 for ; Fri, 16 Apr 2021 15:35:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 DDC0624C17 for ; Fri, 16 Apr 2021 15:35: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 8A50445B64 for ; Fri, 16 Apr 2021 15:35:21 +0200 (CEST) From: Wolfgang Bumiller To: pbs-devel@lists.proxmox.com Date: Fri, 16 Apr 2021 15:34:57 +0200 Message-Id: <20210416133517.23349-5-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210416133517.23349-1-w.bumiller@proxmox.com> References: <20210416133517.23349-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [http.rs] Subject: [pbs-devel] [RFC backup 04/23] tools::http: generic 'fn request' and dedup agent string 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, 16 Apr 2021 13:35:54 -0000 Signed-off-by: Wolfgang Bumiller --- src/tools/http.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/tools/http.rs b/src/tools/http.rs index d08ce451..136a678f 100644 --- a/src/tools/http.rs +++ b/src/tools/http.rs @@ -28,11 +28,17 @@ lazy_static! { }; } +const USER_AGENT_STRING: &str = "proxmox-backup-client/1.0"; + +pub async fn request(request: http::request::Builder, body: Body) -> Result, Error> { + Ok(HTTP_CLIENT.request(request.header("User-Agent", USER_AGENT_STRING).body(body)?).await?) +} + pub async fn get_string(uri: &str, extra_headers: Option<&HashMap>) -> Result { let mut request = Request::builder() .method("GET") .uri(uri) - .header("User-Agent", "proxmox-backup-client/1.0"); + .header("User-Agent", USER_AGENT_STRING); if let Some(hs) = extra_headers { for (h, v) in hs.iter() { @@ -73,7 +79,7 @@ pub async fn post( let request = Request::builder() .method("POST") .uri(uri) - .header("User-Agent", "proxmox-backup-client/1.0") + .header("User-Agent", USER_AGENT_STRING) .header(hyper::header::CONTENT_TYPE, content_type) .body(body)?; -- 2.20.1