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 C07E171A6A for ; Fri, 9 Apr 2021 10:15:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B419D23722 for ; Fri, 9 Apr 2021 10:14:57 +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 3F1542371A for ; Fri, 9 Apr 2021 10:14:57 +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 0B6B241FD3 for ; Fri, 9 Apr 2021 10:14:57 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 9 Apr 2021 10:14:56 +0200 Message-Id: <20210409081456.31189-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.166 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. [fe80::1] WEIRD_PORT 0.001 Uses non-standard port number for HTTP Subject: [pbs-devel] [PATCH proxmox-backup] 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: Fri, 09 Apr 2021 08:15:27 -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 --- we could also only add it to the actual request if wanted, should not make much of a difference though src/client/http_client.rs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/client/http_client.rs b/src/client/http_client.rs index 76ab0391..07e8cd83 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, @@ -285,11 +295,13 @@ impl HttpClient { let mut fingerprint = options.fingerprint.take(); + let server = map_ipv6(server); + if fingerprint.is_some() { // do not store fingerprints passed via options in cache options.fingerprint_cache = false; } else if options.fingerprint_cache && options.prefix.is_some() { - fingerprint = load_fingerprint(options.prefix.as_ref().unwrap(), server); + fingerprint = load_fingerprint(options.prefix.as_ref().unwrap(), &server); } let mut ssl_connector_builder = SslConnector::builder(SslMethod::tls()).unwrap(); @@ -344,7 +356,7 @@ impl HttpClient { }; let mut ticket_info = None; if use_ticket_cache { - ticket_info = load_ticket_info(options.prefix.as_ref().unwrap(), server, userid); + ticket_info = load_ticket_info(options.prefix.as_ref().unwrap(), &server, userid); } if let Some((ticket, _token)) = ticket_info { ticket -- 2.20.1