sort keymap array

[pve-common.git] / src / PVE / Tools.pm

diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm
index cb8d9b27b78558c1d46a28f8dbb320e2eb90c521..8c7f3733f80aa0c0338a09c6d9d314122138a342 100644 (file)
--- a/src/PVE/Tools.pm
+++ b/src/PVE/Tools.pm
@@ -678,7 +678,7 @@ my $keymaphash =  {
 };
 
 my $kvmkeymaparray = [];
-foreach my $lc (keys %$keymaphash) {
+foreach my $lc (sort keys %$keymaphash) {
     push @$kvmkeymaparray, $keymaphash->{$lc}->[1];
 }
 
@@ -1219,7 +1219,7 @@ sub sync_mountpoint {
 sub sendmail {
     my ($mailto, $subject, $text, $html, $mailfrom, $author) = @_;
 
-    $mailto = [ $mailto ] if ref($mailto) ne 'ARRAY';
+    $mailto = [ $mailto ] if !ref($mailto);
 
     my $rcvrarg = '';
     foreach my $r (@$mailto) {
@@ -1228,7 +1228,7 @@ sub sendmail {
     my $rcvrtxt = join (', ', @$mailto);
 
     $mailfrom = $mailfrom || "root";
-    $author = $author || 'Proxmox VE mail notifier';
+    $author = $author || 'Proxmox VE';
 
     open (MAIL,"|sendmail -B 8BITMIME -f $mailfrom $rcvrarg") ||
        die "unable to open 'sendmail' - $!";
@@ -1247,7 +1247,7 @@ sub sendmail {
     print MAIL "This is a multi-part message in MIME format.\n\n";
     print MAIL "--$boundary\n";
 
-    if ($text) {
+    if (defined($text)) {
        print MAIL "Content-Type: text/plain;\n";
        print MAIL "\tcharset=\"UTF8\"\n";
        print MAIL "Content-Transfer-Encoding: 8bit\n";
@@ -1262,7 +1262,7 @@ sub sendmail {
        print MAIL "\n--$boundary\n";
     }
 
-    if($html) {
+    if (defined($html)) {
        print MAIL "Content-Type: text/html;\n";
        print MAIL "\tcharset=\"UTF8\"\n";
        print MAIL "Content-Transfer-Encoding: 8bit\n";
@@ -1274,7 +1274,6 @@ sub sendmail {
     }
 
     close(MAIL);
-
 }
 
 sub tempfile {
@@ -1308,4 +1307,19 @@ sub tempfile_contents {
     return ("/proc/$$/fd/".$fh->fileno, $fh);
 }
 
+sub validate_ssh_public_keys {
+    my ($raw) = @_;
+    my @lines = split(/\n/, $raw);
+
+    foreach my $line (@lines) {
+       next if $line =~ m/^\s*$/;
+       eval {
+           my ($filename, $handle) = tempfile_contents($line);
+           run_command(["ssh-keygen", "-l", "-f", $filename],
+                       outfunc => sub {}, errfunc => sub {});
+       };
+       die "SSH public key validation error\n" if $@;
+    }
+}
+
 1;