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 BB1CD69004 for ; Thu, 11 Feb 2021 11:24:49 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A86101A61F for ; Thu, 11 Feb 2021 11:24:19 +0100 (CET) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id E71291A616 for ; Thu, 11 Feb 2021 11:24:18 +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 B079F4623A for ; Thu, 11 Feb 2021 11:24:18 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 11 Feb 2021 11:24:13 +0100 Message-Id: <20210211102413.22502-1-f.ebner@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.001 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 Subject: [pve-devel] [PATCH v2 storage] storage migration: insecure: improve logging X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Feb 2021 10:24:49 -0000 by including the message/error from the remote side. Some people on the forum[0] ran into 'no tunnel IP received', but without information from the remote side it's hard to tell why. [0]: https://forum.proxmox.com/threads/failed-no-tunnel-ip-received.80172 Signed-off-by: Fabian Ebner --- Changes from v1: * keep in capturing regexes to untaint PVE/Storage.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index 22a6ef1..8ee2c92 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -758,8 +758,14 @@ sub storage_migrate { or die "receive command failed: $!\n"; close($input); - my ($ip) = <$info> =~ /^($PVE::Tools::IPRE)$/ or die "no tunnel IP received\n"; - my ($port) = <$info> =~ /^(\d+)$/ or die "no tunnel port received\n"; + my $try_ip = <$info> // ''; + my ($ip) = $try_ip =~ /^($PVE::Tools::IPRE)$/ # untaint + or die "no tunnel IP received, got '$try_ip'\n"; + + my $try_port = <$info> // ''; + my ($port) = $try_port =~ /^(\d+)$/ # untaint + or die "no tunnel port received, got '$try_port'\n"; + my $socket = IO::Socket::IP->new(PeerHost => $ip, PeerPort => $port, Type => SOCK_STREAM) or die "failed to connect to tunnel at $ip:$port\n"; # we won't be reading from the socket -- 2.20.1