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 866E0941D1 for ; Fri, 9 Feb 2024 11:57:06 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6867437B36 for ; Fri, 9 Feb 2024 11:56:36 +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, 9 Feb 2024 11:56: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 8BDE54663C for ; Fri, 9 Feb 2024 11:56:34 +0100 (CET) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Fri, 9 Feb 2024 11:56:01 +0100 Message-ID: <20240209105629.285910-5-c.heiss@proxmox.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240209105629.285910-1-c.heiss@proxmox.com> References: <20240209105629.285910-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.003 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [runenv.pm, proxmox.com] Subject: [pve-devel] [PATCH installer 4/4] fix #4872: run env: use run_command() for country detection 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: Fri, 09 Feb 2024 10:57:06 -0000 This fixes a rather longstanding issue [0][1] with the country detection, in that it might get completely stuck and thus hangs the installation. This is due how Perl, signals and line reading interacts. A minimal reproducer, how the installer currently works, looks like this: ``` #!/usr/bin/env perl use strict; use warnings; open (my $fh, '-|', 'sleep', '1000') or die; my $prev = alarm(2); eval { local $SIG{ALRM} = sub { "timed out!\n" }; my $line; while (defined ($line = <$fh>)) { print "line: $line"; } }; alarm($prev); close($fh); ``` One might expect that this times out after 2 seconds, as specified in `alarm(2)`. The thruth is that `$line = <$fh>` apparently prevents the signal to go through. This then causes the installer to hang there indefinitely, if `traceroute` never progresses - which seems to happen on lots of (weird) networks, as evidently can be seen in the forum [1]. Proxmox::Sys::Command::run_command() handles of these weird cases, takes care of the nitty-gritty details and - most importantly - interacts properly with SIGALRM, so just use that instead. This _should_ really fix that issue, but reproducing it 1:1 as part of the installation process is _very_ hard, basically pure luck. But rewriting the reproducer using run_command (in the exact same way that this patch rewrites detect_country_tracing_to()) fixes the issue there, so it's the best we can probably do. NB: This causes that the traceroute command is now printed to the log (as run_command() logs that by default), which we could also hide e.g. through another parameter if wanted. [0] https://bugzilla.proxmox.com/show_bug.cgi?id=4872 [1] https://forum.proxmox.com/threads/proxmox-installation-trying-to-detect-country.134301/ Signed-off-by: Christoph Heiss --- Proxmox/Install/RunEnv.pm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/Proxmox/Install/RunEnv.pm b/Proxmox/Install/RunEnv.pm index c393f67..ee6b8bc 100644 --- a/Proxmox/Install/RunEnv.pm +++ b/Proxmox/Install/RunEnv.pm @@ -7,6 +7,7 @@ use Carp; use JSON qw(from_json to_json); use Proxmox::Log; +use Proxmox::Sys::Command qw(run_command); use Proxmox::Sys::File qw(file_read_firstline); use Proxmox::Sys::Block; use Proxmox::Sys::Net; @@ -188,34 +189,34 @@ my sub detect_country_tracing_to : prototype($$) { my ($ipver, $destination) = @_; print STDERR "trying to detect country...\n"; - open(my $TRACEROUTE_FH, '-|', 'traceroute', "-$ipver", '-N', '1', '-q', '1', '-n', $destination) - or return undef; + my $traceroute_cmd = ['traceroute', "-$ipver", '-N', '1', '-q', '1', '-n', $destination]; my $geoip_bin = ($ipver == 6) ? 'geoiplookup6' : 'geoiplookup'; my $country; - - my $previous_alarm = alarm (10); eval { local $SIG{ALRM} = sub { die "timed out!\n" }; - my $line; - while (defined ($line = <$TRACEROUTE_FH>)) { + my $previous_alarm = alarm (10); + + run_command($traceroute_cmd, sub { + my $line = shift; + log_debug("DC TRACEROUTE: $line"); if ($line =~ m/^\s*\d+\s+(\S+)\s/) { my $geoip = qx/$geoip_bin $1/; log_debug("DC GEOIP: $geoip"); + if ($geoip =~ m/GeoIP Country Edition:\s*([A-Z]+),/) { $country = lc ($1); log_info("DC FOUND: $country\n"); - last; + return 1; } } - } + }, undef, undef, 1); + + alarm ($previous_alarm); }; my $err = $@; - alarm ($previous_alarm); - - close($TRACEROUTE_FH); if ($err) { die "unable to detect country - $err\n"; -- 2.43.0