X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FTools.pm;h=0a7efeb8dce920d1904d651b66d1b20234ff1e46;hp=2c64f6ac33206791a5e70b038b49b76fa71b13dd;hb=e97f807c388c10250f442b1f16c5315df2ffc2af;hpb=8fd0d63460153d1aeb2933a71ffdd18a8448d960

diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm
index 2c64f6a..0a7efeb 100644
--- a/src/PVE/Tools.pm
+++ b/src/PVE/Tools.pm
@@ -24,9 +24,6 @@ use JSON;
 use Text::ParseWords;
 use String::ShellQuote;
 use Time::HiRes qw(usleep gettimeofday tv_interval alarm);
-use Net::DBus qw(dbus_uint32 dbus_uint64);
-use Net::DBus::Callback;
-use Net::DBus::Reactor;
 use Scalar::Util 'weaken';
 use PVE::Syscall;
 
@@ -369,6 +366,7 @@ sub run_command {
     my $afterfork;
     my $noerr;
     my $keeplocale;
+    my $quiet;
 
     eval {
 
@@ -395,6 +393,8 @@ sub run_command {
 		$noerr = $param{$p};
 	    } elsif ($p eq 'keeplocale') {
 		$keeplocale = $param{$p};
+	    } elsif ($p eq 'quiet') {
+		$quiet = $param{$p};
 	    } else {
 		die "got unknown parameter '$p' for run_command\n";
 	    }
@@ -497,7 +497,7 @@ sub run_command {
 			    waitpid ($pid, 0);
 			    die $err;
 			}
-		    } else {
+		    } elsif (!$quiet) {
 			print $buf;
 			*STDOUT->flush();
 		    }
@@ -517,7 +517,7 @@ sub run_command {
 			    waitpid ($pid, 0);
 			    die $err;
 			}
-		    } else {
+		    } elsif (!$quiet) {
 			print STDERR $buf;
 			*STDERR->flush();
 		    }
@@ -791,17 +791,20 @@ sub extract_param {
 
 # Note: we use this to wait until vncterm/spiceterm is ready
 sub wait_for_vnc_port {
-    my ($port, $timeout) = @_;
+    my ($port, $family, $timeout) = @_;
 
     $timeout = 5 if !$timeout;
     my $sleeptime = 0;
     my $starttime = [gettimeofday];
     my $elapsed;
 
+    my $cmd = ['/bin/ss', '-Htln', "sport = :$port"];
+    push @$cmd, $family == AF_INET6 ? '-6' : '-4' if defined($family);
+
     my $found;
     while (($elapsed = tv_interval($starttime)) < $timeout) {
 	# -Htln = don't print header, tcp, listening sockets only, numeric ports
-	run_command(['/bin/ss', '-Htln', "sport = :$port"], outfunc => sub {
+	run_command($cmd, outfunc => sub {
 	    my $line = shift;
 	    if ($line =~ m/^LISTEN\s+\d+\s+\d+\s+\S+:(\d+)\s/) {
 		$found = 1 if ($port == $1);
@@ -898,6 +901,13 @@ sub next_spice_port {
     return next_unused_port(61000, 61099, $family, $address);
 }
 
+sub must_stringify {
+	my ($value) = @_;
+	eval { $value = "$value" };
+	return "error turning value into a string: $@" if $@;
+	return $value;
+}
+
 # sigkill after $timeout  a $sub running in a fork if it can't write a pipe
 # the $sub has to return a single scalar
 sub run_fork_with_timeout {
@@ -929,7 +939,7 @@ sub run_fork_with_timeout {
 	    $pipe_out->flush();
 	};
 	if (my $err = $@) {
-	    print {$pipe_out} encode_json({ error => $err });
+	    print {$pipe_out} encode_json({ error => must_stringify($err) });
 	    $pipe_out->flush();
 	    POSIX::_exit(1);
 	}
@@ -975,49 +985,40 @@ sub run_fork {
 sub df {
     my ($path, $timeout) = @_;
 
-    my $res = {
-	total => 0,
-	used => 0,
-	avail => 0,
+    my $df = sub { return Filesys::Df::df($path, 1) };
+
+    my $res = eval { run_fork_with_timeout($timeout, $df) } // {};
+    warn $@ if $@;
+
+    # untaint the values
+    my ($blocks, $used, $bavail) = map { defined($_) ? (/^(\d+)$/) : 0 }
+	$res->@{qw(blocks used bavail)};
+
+    return {
+	total => $blocks,
+	used => $used,
+	avail => $bavail,
     };
+}
 
-    my $pipe = IO::Pipe->new();
-    my $child = fork();
-    if (!defined($child)) {
-	warn "fork failed: $!\n";
-	return $res;
-    }
+sub du {
+    my ($path, $timeout) = @_;
 
-    if (!$child) {
-	$pipe->writer();
-	eval {
-	    my $df = Filesys::Df::df($path, 1);
-	    print {$pipe} "$df->{blocks}\n$df->{used}\n$df->{bavail}\n"
-		if defined($df);
-	    $pipe->close();
-	};
-	if (my $err = $@) {
-	    warn $err;
-	    POSIX::_exit(1);
-	}
-	POSIX::_exit(0);
-    }
+    my $size;
 
-    $pipe->reader();
+    $timeout //= 10;
 
-    my $readvalues = sub {
-	$res->{total} = int(((<$pipe> // 0) =~ /^(\d*)$/)[0]);
-	$res->{used}  = int(((<$pipe> // 0) =~ /^(\d*)$/)[0]);
-	$res->{avail} = int(((<$pipe> // 0) =~ /^(\d*)$/)[0]);
-    };
-    eval {
-	run_with_timeout($timeout, $readvalues);
+    my $parser = sub {
+	my $line = shift;
+
+	if ($line =~ m/^(\d+)\s+total$/) {
+	    $size = $1;
+	}
     };
-    warn $@ if $@;
-    $pipe->close();
-    kill('KILL', $child);
-    waitpid($child, 0);
-    return $res;
+
+    run_command(['du', '-scb', $path], outfunc => $parser, timeout => $timeout);
+
+    return $size;
 }
 
 # UPID helper
@@ -1540,77 +1541,6 @@ sub mkdirat($$$) {
     return syscall(PVE::Syscall::mkdirat, $dirfd, $name, $mode) == 0;
 }
 
-# NOTE: This calls the dbus main loop and must not be used when another dbus
-# main loop is being used as we need to wait for the JobRemoved signal.
-# Polling the job status instead doesn't work because this doesn't give us the
-# distinction between success and failure.
-#
-# Note that the description is mandatory for security reasons.
-sub enter_systemd_scope {
-    my ($unit, $description, %extra) = @_;
-    die "missing description\n" if !defined($description);
-
-    my $timeout = delete $extra{timeout};
-
-    $unit .= '.scope';
-    my $properties = [ [PIDs => [dbus_uint32($$)]] ];
-
-    foreach my $key (keys %extra) {
-	if ($key eq 'Slice' || $key eq 'KillMode') {
-	    push @$properties, [$key, $extra{$key}];
-	} elsif ($key eq 'CPUShares') {
-	    push @$properties, [$key, dbus_uint64($extra{$key})];
-	} elsif ($key eq 'CPUQuota') {
-	    push @$properties, ['CPUQuotaPerSecUSec',
-	                        dbus_uint64($extra{$key} * 10000)];
-	} else {
-	    die "Don't know how to encode $key for systemd scope\n";
-	}
-    }
-
-    my $job;
-    my $done = 0;
-
-    my $bus = Net::DBus->system();
-    my $reactor = Net::DBus::Reactor->main();
-
-    my $service = $bus->get_service('org.freedesktop.systemd1');
-    my $if = $service->get_object('/org/freedesktop/systemd1', 'org.freedesktop.systemd1.Manager');
-    # Connect to the JobRemoved signal since we want to wait for it to finish
-    my $sigid;
-    my $timer;
-    my $cleanup = sub {
-	my ($no_shutdown) = @_;
-	$if->disconnect_from_signal('JobRemoved', $sigid) if defined($if);
-	$if = undef;
-	$sigid = undef;
-	$reactor->remove_timeout($timer) if defined($timer);
-	$timer = undef;
-	return if $no_shutdown;
-	$reactor->shutdown();
-    };
-
-    $sigid = $if->connect_to_signal('JobRemoved', sub {
-	my ($id, $removed_job, $signaled_unit, $result) = @_;
-	return if $signaled_unit ne $unit || $removed_job ne $job;
-	$cleanup->(0);
-	die "systemd job failed\n" if $result ne 'done';
-	$done = 1;
-    });
-
-    my $on_timeout = sub {
-	$cleanup->(0);
-	die "systemd job timed out\n";
-    };
-
-    $timer = $reactor->add_timeout($timeout * 1000, Net::DBus::Callback->new(method => $on_timeout))
-	if defined($timeout);
-    $job = $if->StartTransientUnit($unit, 'fail', $properties, []);
-    $reactor->run();
-    $cleanup->(1);
-    die "systemd job never completed\n" if !$done;
-}
-
 my $salt_starter = time();
 
 sub encrypt_pw {
@@ -1626,9 +1556,16 @@ sub encrypt_pw {
 }
 
 # intended usage: convert_size($val, "kb" => "gb")
-# on reduction (converting to a bigger unit) we round up by default if
-# information got lost. E.g. `convert_size(1023, "b" => "kb")` returns 1
+# we round up to the next integer by default
+# E.g. `convert_size(1023, "b" => "kb")` returns 1
 # use $no_round_up to switch this off, above example would then return 0
+# this is also true for converting down e.g. 0.0005 gb to mb returns 1
+# (0 if $no_round_up is true)
+# allowed formats for value:
+# 1234
+# 1234.
+# 1234.1234
+# .1234
 sub convert_size {
     my ($value, $from, $to, $no_round_up) = @_;
 
@@ -1641,21 +1578,22 @@ sub convert_size {
 	pb => 5,
     };
 
-    $from = lc($from); $to = lc($to);
+    die "no value given"
+	if !defined($value) || $value eq "";
+
+    $from = lc($from // ''); $to = lc($to // '');
     die "unknown 'from' and/or 'to' units ($from => $to)"
-	if !(defined($units->{$from}) && defined($units->{$to}));
+	if !defined($units->{$from}) || !defined($units->{$to});
 
-    my $shift_amount = $units->{$from} - $units->{$to};
+    die "value '$value' is not a valid, positive number"
+	if $value !~ m/^(?:[0-9]+\.?[0-9]*|[0-9]*\.[0-9]+)$/;
 
-    if ($shift_amount > 0) {
-	$value <<= ($shift_amount * 10);
-    } elsif ($shift_amount < 0) {
-	my $remainder = ($value & (1 << abs($shift_amount)*10) - 1);
-	$value >>= abs($shift_amount) * 10;
-	$value++ if $remainder && !$no_round_up;
-    }
+    my $shift_amount = ($units->{$from} - $units->{$to}) * 10;
+
+    $value *= 2**$shift_amount;
+    $value++ if !$no_round_up && ($value - int($value)) > 0.0;
 
-    return $value;
+    return int($value);
 }
 
 1;