X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FTools.pm;h=1a342ee04cc660f88dd567d4442ba895be5a0f43;hp=d886a3dd4343b9bf31886d87915b780d82fa9044;hb=771d18f5c7be2055f0c9012f7f921f6d5f6337db;hpb=00dc9d0fa9b1145570f0d653bf0741469a7b91ed diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm index d886a3d..1a342ee 100644 --- a/src/PVE/Tools.pm +++ b/src/PVE/Tools.pm @@ -4,6 +4,7 @@ use strict; use warnings; use POSIX qw(EINTR); use IO::Socket::IP; +use Socket qw(AF_INET AF_INET6 AI_ALL AI_V4MAPPED); use IO::Select; use File::Basename; use File::Path qw(make_path); @@ -17,7 +18,7 @@ use Encode; use Digest::SHA; use Text::ParseWords; use String::ShellQuote; -use Time::HiRes qw(usleep gettimeofday tv_interval); +use Time::HiRes qw(usleep gettimeofday tv_interval alarm); # avoid warning when parsing long hex values with hex() no warnings 'portable'; # Support for 64-bit ints required @@ -62,35 +63,43 @@ our $IPV6RE = "(?:" . "(?:(?:(?:(?:$IPV6H16:){0,5}$IPV6H16)?::" . ")$IPV6H16)|" . "(?:(?:(?:(?:$IPV6H16:){0,6}$IPV6H16)?::" . ")))"; +use constant (CLONE_NEWNS => 0x00020000, + CLONE_NEWUTS => 0x04000000, + CLONE_NEWIPC => 0x08000000, + CLONE_NEWUSER => 0x10000000, + CLONE_NEWPID => 0x20000000, + CLONE_NEWNET => 0x40000000); + sub run_with_timeout { my ($timeout, $code, @param) = @_; die "got timeout\n" if $timeout <= 0; - my $prev_alarm; + my $prev_alarm = alarm 0; # suspend outer alarm early my $sigcount = 0; my $res; - local $SIG{ALRM} = sub { $sigcount++; }; # catch alarm outside eval - eval { local $SIG{ALRM} = sub { $sigcount++; die "got timeout\n"; }; local $SIG{PIPE} = sub { $sigcount++; die "broken pipe\n" }; local $SIG{__DIE__}; # see SA bug 4631 - $prev_alarm = alarm($timeout); + alarm($timeout); - $res = &$code(@param); + eval { $res = &$code(@param); }; alarm(0); # avoid race conditions + + die $@ if $@; }; my $err = $@; - alarm($prev_alarm) if defined($prev_alarm); + alarm $prev_alarm; + # this shouldn't happen anymore? die "unknown error" if $sigcount && !$err; # seems to happen sometimes die $err if $err; @@ -239,22 +248,59 @@ sub safe_read_from { return $input; } +# The $cmd parameter can be: +# -) a string +# This is generally executed by passing it to the shell with the -c option. +# However, it can be executed in one of two ways, depending on whether +# there's a pipe involved: +# *) with pipe: passed explicitly to bash -c, prefixed with: +# set -o pipefail && +# *) without a pipe: passed to perl's open3 which uses 'sh -c' +# (Note that this may result in two different syntax requirements!) +# FIXME? +# -) an array of arguments (strings) +# Will be executed without interference from a shell. (Parameters are passed +# as is, no escape sequences of strings will be touched.) +# -) an array of arrays +# Each array represents a command, and each command's output is piped into +# the following command's standard input. +# For this a shell command string is created with pipe symbols between each +# command. +# Each command is a list of strings meant to end up in the final command +# unchanged. In order to achieve this, every argument is shell-quoted. +# Quoting can be disabled for a particular argument by turning it into a +# reference, this allows inserting arbitrary shell options. +# For instance: the $cmd [ [ 'echo', 'hello', \'>/dev/null' ] ] will not +# produce any output, while the $cmd [ [ 'echo', 'hello', '>/dev/null' ] ] +# will literally print: hello >/dev/null sub run_command { my ($cmd, %param) = @_; my $old_umask; my $cmdstr; - if (!ref($cmd)) { + if (my $ref = ref($cmd)) { + if (ref($cmd->[0])) { + $cmdstr = 'set -o pipefail && '; + my $pipe = ''; + foreach my $command (@$cmd) { + # concatenate quoted parameters + # strings which are passed by reference are NOT shell quoted + $cmdstr .= $pipe . join(' ', map { ref($_) ? $$_ : shellquote($_) } @$command); + $pipe = ' | '; + } + $cmd = [ '/bin/bash', '-c', "set -o pipefail && $cmdstr" ]; + } else { + $cmdstr = cmd2string($cmd); + } + } else { $cmdstr = $cmd; - if ($cmd =~ m/|/) { + if ($cmd =~ m/\|/) { # see 'man bash' for option pipefail $cmd = [ '/bin/bash', '-c', "set -o pipefail && $cmd" ]; } else { $cmd = [ $cmd ]; } - } else { - $cmdstr = cmd2string($cmd); } my $errmsg; @@ -659,7 +705,7 @@ sub wait_for_vnc_port { } sub next_unused_port { - my ($range_start, $range_end) = @_; + my ($range_start, $range_end, $family) = @_; # We use a file to register allocated ports. # Those registrations expires after $expiretime. @@ -692,10 +738,11 @@ sub next_unused_port { next if $ports->{$p}; # reserved my $sock = IO::Socket::IP->new(Listen => 5, - LocalAddr => '0.0.0.0', LocalPort => $p, ReuseAddr => 1, - Proto => 0); + Family => $family, + Proto => 0, + GetAddrInfoFlags => 0); if ($sock) { close($sock); @@ -724,15 +771,18 @@ sub next_unused_port { } sub next_migrate_port { - return next_unused_port(60000, 60050); + my ($family) = @_; + return next_unused_port(60000, 60050, $family); } sub next_vnc_port { - return next_unused_port(5900, 6000); + my ($family) = @_; + return next_unused_port(5900, 6000, $family); } sub next_spice_port { - return next_unused_port(61000, 61099); + my ($family) = @_; + return next_unused_port(61000, 61099, $family); } # NOTE: NFS syscall can't be interrupted, so alarm does @@ -983,6 +1033,37 @@ sub dump_logfile { return ($count, $lines); } +sub dump_journal { + my ($start, $limit, $filter) = @_; + + my $lines = []; + my $count = 0; + + $start = 0 if !$start; + $limit = 50 if !$limit; + + my $parser = sub { + my $line = shift; + + return if $count++ < $start; + return if $limit <= 0; + push @$lines, { n => int($count), t => $line}; + $limit--; + }; + + my $cmd = ['journalctl', '-o', 'short', '--no-pager']; + run_command($cmd, outfunc => $parser); + + # HACK: ExtJS store.guaranteeRange() does not like empty array + # so we add a line + if (!$count) { + $count++; + push @$lines, { n => $count, t => "no content"}; + } + + return ($count, $lines); +} + sub dir_glob_regex { my ($dir, $regex) = @_; @@ -1043,4 +1124,45 @@ sub fnv31a { sub fnv31a_hex { return sprintf("%X", fnv31a(@_)); } +sub unpack_sockaddr_in46 { + my ($sin) = @_; + my $family = Socket::sockaddr_family($sin); + my ($port, $host) = ($family == AF_INET6 ? Socket::unpack_sockaddr_in6($sin) + : Socket::unpack_sockaddr_in($sin)); + return ($family, $port, $host); +} + +sub getaddrinfo_all { + my ($hostname, @opts) = @_; + my %hints = ( flags => AI_V4MAPPED | AI_ALL, + @opts ); + my ($err, @res) = Socket::getaddrinfo($hostname, '0', \%hints); + die "failed to get address info for: $hostname: $err\n" if $err; + return @res; +} + +sub get_host_address_family { + my ($hostname, $socktype) = @_; + my @res = getaddrinfo_all($hostname, socktype => $socktype); + return $res[0]->{family}; +} + +# Parses any sane kind of host, or host+port pair: +# The port is always optional and thus may be undef. +sub parse_host_and_port { + my ($address) = @_; + if ($address =~ /^($IPV4RE|[[:alnum:]\-.]+)(?::(\d+))?$/ || # ipv4 or host with optional ':port' + $address =~ /^\[($IPV6RE|$IPV4RE|[[:alnum:]\-.]+)\](?::(\d+))?$/ || # anything in brackets with optional ':port' + $address =~ /^($IPV6RE)(?:\.(\d+))?$/) # ipv6 with optional port separated by dot + { + return ($1, $2, 1); # end with 1 to support simple if(parse...) tests + } + return; # nothing +} + +sub unshare { + my ($flags) = @_; + syscall 272, $flags; +} + 1;