use strict;
use warnings;
-use POSIX qw(EINTR);
+use POSIX qw(EINTR EEXIST);
use IO::Socket::IP;
use Socket qw(AF_INET AF_INET6 AI_ALL AI_V4MAPPED);
use IO::Select;
my $tmpname = "$filename.tmp.$$";
eval {
- my $fh = IO::File->new($tmpname, O_WRONLY|O_CREAT, $perm);
+ my ($fh, $tries) = (undef, 0);
+ while (!$fh && $tries++ < 3) {
+ $fh = IO::File->new($tmpname, O_WRONLY|O_CREAT|O_EXCL, $perm);
+ if (!$fh && $! == EEXIST) {
+ unlink($tmpname) or die "unable to delete old temp file: $!\n";
+ }
+ }
die "unable to open file '$tmpname' - $!\n" if !$fh;
die "unable to write '$tmpname' - $!\n" unless print $fh $data;
die "closing file '$tmpname' failed - $!\n" unless close $fh;
$cmdstr .= $pipe . join(' ', map { ref($_) ? $$_ : shellquote($_) } @$command);
$pipe = ' | ';
}
- $cmd = [ '/bin/bash', '-c', "set -o pipefail && $cmdstr" ];
+ $cmd = [ '/bin/bash', '-c', "$cmdstr" ];
} else {
$cmdstr = cmd2string($cmd);
}
$pipe->reader();
my $readvalues = sub {
- $res->{total} = int(<$pipe>);
- $res->{used} = int(<$pipe>);
- $res->{avail} = int(<$pipe>);
+ $res->{total} = int((<$pipe> =~ /^(\d*)$/)[0]);
+ $res->{used} = int((<$pipe> =~ /^(\d*)$/)[0]);
+ $res->{avail} = int((<$pipe> =~ /^(\d*)$/)[0]);
};
eval {
run_with_timeout($timeout, $readvalues);
}
sub random_ether_addr {
+ my ($prefix) = @_;
my ($seconds, $microseconds) = gettimeofday;
- my $rand = Digest::SHA::sha1_hex($$, rand(), $seconds, $microseconds);
+ my $rand = Digest::SHA::sha1($$, rand(), $seconds, $microseconds);
# clear multicast, set local id
vec($rand, 0, 8) = (vec($rand, 0, 8) & 0xfe) | 2;
- return sprintf("%02X:%02X:%02X:%02X:%02X:%02X", unpack("C6", $rand));
+ my $addr = sprintf("%02X:%02X:%02X:%02X:%02X:%02X", unpack("C6", $rand));
+ if (defined($prefix)) {
+ $addr = uc($prefix) . substr($addr, length($prefix));
+ }
+ return $addr;
}
sub shellquote {
# mailto may be a single email string or an array of receivers
sub sendmail {
my ($mailto, $subject, $text, $html, $mailfrom, $author) = @_;
+ my $mail_re = qr/[^-a-zA-Z0-9+._@]/;
$mailto = [ $mailto ] if !ref($mailto);
- my $rcvrarg = '';
- foreach my $r (@$mailto) {
- $rcvrarg .= " '$r'";
+ foreach (@$mailto) {
+ die "illegal character in mailto address\n"
+ if ($_ =~ $mail_re);
}
+
my $rcvrtxt = join (', ', @$mailto);
$mailfrom = $mailfrom || "root";
+ die "illegal character in mailfrom address\n"
+ if $mailfrom =~ $mail_re;
+
$author = $author || 'Proxmox VE';
- open (MAIL,"|sendmail -B 8BITMIME -f $mailfrom $rcvrarg") ||
+ open (MAIL, "|-", "sendmail", "-B", "8BITMIME", "-f", $mailfrom, @$mailto) ||
die "unable to open 'sendmail' - $!";
# multipart spec see https://www.ietf.org/rfc/rfc1521.txt