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;
my $afterfork;
my $noerr;
my $keeplocale;
+ my $quiet;
eval {
$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";
}
waitpid ($pid, 0);
die $err;
}
- } else {
+ } elsif (!$quiet) {
print $buf;
*STDOUT->flush();
}
waitpid ($pid, 0);
die $err;
}
- } else {
+ } elsif (!$quiet) {
print STDERR $buf;
*STDERR->flush();
}
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 {
$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);
}
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
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 {