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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B146E795D5 for ; Tue, 4 May 2021 15:02:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 995559881 for ; Tue, 4 May 2021 15:01:39 +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 16A3C9877 for ; Tue, 4 May 2021 15:01:39 +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 D5D7A429F5 for ; Tue, 4 May 2021 15:01:38 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 4 May 2021 15:01:38 +0200 Message-Id: <20210504130138.32568-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.010 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. [fe80::1] WEIRD_PORT 0.001 Uses non-standard port number for HTTP Subject: [pbs-devel] [PATCH proxmox-backup v2] client/http_client: add necessary brackets 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, 04 May 2021 13:02:09 -0000 if we are given a 'naked' ipv6 without square brackets around it, we need to add them ourselves, since the address is ambigious otherwise when we add the port. e.g. giving 'fe80::1' as address we arrive at the url (with the default port) 'https://fe80::1:8007/' Signed-off-by: Dominik Csapak --- changes from v1: * move the actual mapping to the request building functions src/client/http_client.rs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/client/http_client.rs b/src/client/http_client.rs index 76ab0391..ab7bda48 100644 --- a/src/client/http_client.rs +++ b/src/client/http_client.rs @@ -273,6 +273,16 @@ fn load_ticket_info(prefix: &str, server: &str, userid: &Userid) -> Option<(Stri } } +fn map_ipv6(server: &str) -> String { + let bytes = server.as_bytes(); + let len = bytes.len(); + if len > 3 && bytes.contains(&b':') && bytes[0] != b'[' && bytes[len-1] != b']' { + format!("[{}]", server) + } else { + server.to_string() + } +} + impl HttpClient { pub fn new( server: &str, @@ -615,7 +625,8 @@ impl HttpClient { ) -> Result { let path = path.trim_matches('/'); - let mut url = format!("https://{}:{}/{}", &self.server, self.port, path); + let server = map_ipv6(&self.server); + let mut url = format!("https://{}:{}/{}", server, self.port, path); if let Some(data) = data { let query = tools::json_object_to_query(data).unwrap(); @@ -758,6 +769,7 @@ impl HttpClient { pub fn request_builder(server: &str, port: u16, method: &str, path: &str, data: Option) -> Result, Error> { let path = path.trim_matches('/'); + let server = map_ipv6(server); let url: Uri = format!("https://{}:{}/{}", server, port, path).parse()?; if let Some(data) = data { @@ -970,6 +982,7 @@ impl H2Client { let path = path.trim_matches('/'); let content_type = content_type.unwrap_or("application/x-www-form-urlencoded"); + let server = map_ipv6(server); if let Some(param) = param { let query = tools::json_object_to_query(param)?; -- 2.20.1