Changeset 354 in ProjectBuilder

Timestamp:

Apr 5, 2008, 12:14:28 PM (16 years ago)

Author:

Bruno Cornec

Message:

Avoid the duplication of the ssh key in root's authorized_keys file so setupvm is not idempotent

File:

• devel/pb/bin/pb (modified) (4 diffs)

devel/pb/bin/pb

@@ -1229 +1229 @@
     # Do not use the one passed potentially with -a
     my ($pbac) = pb_conf_get($vtype."login");
+    my ($key,$zero0,$zero1,$zero2);
 
     if ($vtype eq "vm") {
@@ -1244 +1245 @@
         return if (($vmpid == 0) && ($vmexist == 0));
     
+        # Store the pub key part in a variable
+        open(FILE,"$keyfile.pub") || die "Unable to open $keyfile.pub";
+        ($zero0,$zero1,$zero2) = split(/ /,<FILE>);
+        close(FILE);
+
+        $key = "\Q$zero1";
+
         pb_system("cat $keyfile.pub | ssh -q -p $nport -i $keyfile root\@$vmhost->{$ENV{'PBPROJ'}} \"mkdir -p .ssh ; chmod 700 .ssh ; cat >> .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys\"","Copying local keys to $vtype. This will require the root password");
         # once this is done, we can do what we want on the VM remotely
@@ -1258 +1266 @@
 use File::Copy;
 
+EOF
+    if ($vtype eq "vm") {
+        print SCRIPT << 'EOF';
+# Removes duplicate in .ssh/authorized_keys of our key if needed
+#
+my $file1="$ENV{'HOME'}/.ssh/authorized_keys";
+open(PBFILE,$file1) || die "Unable to open $file1";
+open(PBOUT,"> $file1.new") || die "Unable to open $file1.new";
+my $count = 0;
+while (<PBFILE>) {
+EOF
+        print SCRIPT << "EOF";
+    if (/ $key /) {
+        \$count++;
+    }
+print PBOUT \$_ if ((\$count <= 1) || (\$_ !~ / $key /));
+}
+close(PBFILE);
+close(PBOUT);
+rename("\$file1.new",\$file1);
+chmod 0600,\$file1;
+EOF
+    }
+    print SCRIPT << 'EOF';
+
+# Adds $pbac->{$ENV{'PBPROJ'}} as an account if needed
+#
 my $file="/etc/passwd";
 open(PBFILE,$file) || die "Unable to open $file";
@@ -1279 +1314 @@
 system "useradd $pbac->{$ENV{'PBPROJ'}} -g $pbac->{$ENV{'PBPROJ'}} -m -d /home/$pbac->{$ENV{'PBPROJ'}}";
 
-# For pb
+# allow ssh entry to build
+#
 chdir "/home/$pbac->{$ENV{'PBPROJ'}}";
 mkdir ".ssh",0700;