Changeset 2050 in ProjectBuilder

Timestamp:

Feb 20, 2016, 8:37:15 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug in script2v by initializing pbstep to 3 as it wasn't defined (use mode)
• Only use ECDSA ssh mode when DSA is not available to preserve compatibility
• Using -s option requires a full path name for the script to work, which is now checked
• Do not call pb_ssh_get when pushing packages to ftp repo
• Update the pbscript hash for key $v with the one passed in param with -s in additin to the default key to fix pb_send2target
• Use id_* keys only when not in create mode (delivery to repo). Otherwise use pb_* keys

File:

• 0.13.2/pb/bin/pb (modified) (17 diffs)

0.13.2/pb/bin/pb

@@ -762 +762 @@
 if (defined $opts{'s'}) {
     $pbscript{'default'} = $opts{'s'};
+    die "option -s requires a script having a full path name" if ($pbscript{'default'} !~ /^\//);
 }
 if (defined $opts{'a'}) {
@@ -1969 +1970 @@
 
     my $cmt = shift;
-    my $pbscript = shift;
+    my $pbscript1 = shift;
     my $v = shift;
     my $vexist = shift;         # 0 is FALSE
@@ -2538 +2539 @@
         $cptarget = "CPAN";
     } else {
-        my $keyfile = pb_ssh_get(0,$mac,$nport);
         my $keyopt = "";
-        $keyopt = "-i $keyfile" if ((defined $keyfile) && ($cmt !~ /Packages/));
+        if ($cmt !~ /Packages/) {
+            my $keyfile = pb_ssh_get(0,$remhost,$nport);
+            $keyopt = "-i $keyfile" if (defined $keyfile);
+        }
         my $sshcmd = pb_check_req("ssh",1);
         my $scpcmd = pb_check_req("scp",1);
@@ -2625 +2628 @@
 
     # Use the right script name depending on context
-    my $pbscript1;
+    my $pbscript2;
     if (($cmt =~ /^(V[EM]|RM)/) || ($cmt =~ /Packages/)){
-        $pbscript1 = $pbscript{$v};
+        $pbscript2 = $pbscript{$v};
     } else {
-        $pbscript1 = "pbscript";
+        $pbscript2 = "pbscript";
     }
 
@@ -2637 +2640 @@
     if ($cmt ne "CPAN") {
         if (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep < 3)) {
-            copy("$pbscript1","$context");
-            my $s = basename($pbscript1);
+            copy("$pbscript2","$context");
+            my $s = basename($pbscript2);
             print DOCKER "COPY $s $cptarget/\n";
             # call directly with perl to avoid text file busy error messages
@@ -2646 +2649 @@
             close(DOCKER);
         } elsif (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep >= 3)) {
-            $dkcmd = "/bin/bash $homedir/$tdir-2/".basename($pbscript1);
+            $dkcmd = "/bin/bash $homedir/$tdir-2/".basename($pbscript2);
         } else {
-            my $s = basename($pbscript1);
+            my $s = basename($pbscript2);
             $shcmd .= " \"echo \'cd $tdir ; if [ -x $s ]; then ./$s; fi ;  if [ $pbkeep == 0 ]; then rm -f $s; fi\' | bash\"";
         }
@@ -2666 +2669 @@
             $tsrc .= " ".basename($f);
         }
-        my $ts = "$ENV{'PBTMP'}/vebuild/".basename($pbscript1);
+        my $ts = "$ENV{'PBTMP'}/vebuild/".basename($pbscript2);
         open(DOCKER," > $ts") || confess "Unable to create $ts";
         print DOCKER "#!/bin/bash\n";
@@ -2677 +2680 @@
         print DOCKER "done\n";
         print DOCKER "(cd $homedir/$tdir-2 ; ls -al)\n";
-        print DOCKER pb_get_content($pbscript1);
+        print DOCKER pb_get_content($pbscript2);
         print DOCKER "\n# Get content back from guest in a host dir\n";
         # Host dir seen as TDIR in container
@@ -2747 +2750 @@
         }
     }
-    unlink("$pbscript{$v}") if ((($cmt =~ /^(V[ME]|RM)/) || ($cmt =~ /Packages/)) && ($pbkeep eq 0));
+    unlink("$pbscript{$v}") if ((($cmt =~ /^(V[ME]|RM)/) || ($cmt =~ /Packages/)) && ($pbkeep eq 0) && ($cmt !~ /Script/));
 
     pb_log(2,"Before halt, vexist: $vexist, vpid: $vpid\n");
@@ -2807 +2810 @@
 $pbforce = 0 if (not defined $pbforce);
 $snapme = 0 if (not defined $snapme);
+$pbstep = 3 if (not defined $pbstep);
 
 pb_log(2,"DEBUG: pb_script2v($vtype,$pbstep,$pbforce,$snapme)\n");
-pb_log(2,"DEBUG: pb_script2v(pbscript: ".Dumper($pbscript)."\n");
+pb_log(2,"DEBUG: pb_script2v(pbscript: ".Dumper($pbscript)."\n") if (defined $pbscript);
 pb_parallel_launchv($pbscript,$vtype,uc($vtype)."Script",$pbstep,$pbimage,$pbforce,$snapme,$pbsnap);
 }
@@ -2866 +2870 @@
     $pm->start($counter) and next if (defined $pbparallel);
     
+    # If launched via script2v then get the script passed as the one for the that VM
+    if (not defined $pbscript->{$v}) {
+        $pbscript->{$v} = $pbscript->{'default'};
+    }
+    #
     # Launch a single operation
-    my $pbscript = $pbscript->{$v} if (defined $pbscript->{$v});
-    $pbscript = $pbscript->{'default'} if (not defined $pbscript);
-    ($vexist,$vpid) = pb_launchv($pbscript,$vtype,$v,$action,$pbstep,$pbforce,$snapme,$pbsnap,$pbimage);
+    ($vexist,$vpid) = pb_launchv($pbscript->{$v},$vtype,$v,$action,$pbstep,$pbforce,$snapme,$pbsnap,$pbimage);
     
     # Skip that VM/RM if something went wrong
@@ -2886 +2893 @@
 sub pb_launchv {
 
-my $pbscript=shift;
+my $pbscript1=shift;        # Just the script name to execute, not the hash
 my $vtype = shift;
 my $v = shift;              # Only 1 VM/VE/RM treated here
@@ -2912 +2919 @@
 pb_log(2,"DEBUG: pb_launchv(vtype,v,step,force,snapme,usesnap: $vtype,$v,$pbstep,$pbforce,$snapme,$usesnap)\n");
 pb_log(2,"DEBUG: pb_launchv(pbimage: $pbimage)\n") if (defined $pbimage);
-pb_log(2,"DEBUG: pb_launchv(pbimage: $pbscript)\n") if (defined $pbscript);
+pb_log(2,"DEBUG: pb_launchv(pbscript $pbscript1)\n") if (defined $pbscript1);
 pb_log(2,"DEBUG: pb_launchv(action: $action)\n") if (defined $action);
 # Keep only the first VM in case many were given
@@ -3097 +3104 @@
 if (defined $action) {
     pb_log(2,"DEBUG: Before send2target, vexist: $vexist, vpid: $vpid, vtype: $vtype, v: $v, action: $action\n");
-    pb_send2target($action,$pbscript,$v,$vexist,$vpid,$snapme,$pbstep);
+    pb_send2target($action,$pbscript1,$v,$vexist,$vpid,$snapme,$pbstep);
 }
 return($vexist,$vpid);
@@ -4473 +4480 @@
 sub pb_ssh_get {
 
-my $create = shift || 0;    # Do not create keys by default
+my $create = shift || 0;    # Do not create keys by default. In that case prefer native keys, not pb's ones
 my $target = shift || "localhost";
 my $nport = shift || "22";
@@ -4486 +4493 @@
 # Check whether ecdsa is accepted by the remote host
 my $ecdsa = 0;
+my $dsa = 0;
 open(SCAN,"ssh-keyscan -p $nport -t ecdsa $target 2>/dev/null |") || pb_log(0,"Unable to check ECDSA support for $target");
 while(<SCAN>) {
     $ecdsa = 1 if ($_ =~ /ecdsa-/);
+    pb_log(2,"Found ECDSA support on $target ($nport)\n");
 }
 close(SCAN);
 
-# We have specific keys by default
-$keyfile = "$ENV{'HOME'}/.ssh/pb_ecdsa";
-if (!(-e $keyfile) && ($create eq 1)) {
-    my $res = pb_system("ssh-keygen -q -b 1024 -N '' -f $keyfile -t ecdsa","Generating ECDSA SSH keys for pb");
-    $keyfile = "$ENV{'HOME'}/.ssh/pb_dsa";
-    if (($res != 0) && !(-e $keyfile) && ($create eq 1)) {
+open(SCAN,"ssh-keyscan -p $nport -t dsa $target 2>/dev/null |") || pb_log(0,"Unable to check DSA support for $target");
+while(<SCAN>) {
+    $dsa = 1 if ($_ =~ /dsa-/);
+    pb_log(2,"Found DSA support on $target ($nport)\n");
+}
+close(SCAN);
+
+# We have specific keys by default - create them if needed
+if (!(-e "$ENV{'HOME'}/.ssh/pb_ecdsa") && ($create eq 1)) {
+    my $res = pb_system("ssh-keygen -q -b 1024 -N '' -f $ENV{'HOME'}/.ssh/pb_ecdsa -t ecdsa","Generating ECDSA SSH keys for pb");
+    if (($res != 0) && !(-e "$ENV{'HOME'}/.ssh/pb_dsa") && ($create eq 1)) {
         # ecdsa may not be supported if old ssh
-        pb_system("ssh-keygen -q -b 1024 -N '' -f $keyfile -t dsa","Generating DSA SSH keys for pb");
-    }
-}
-
-$keyfile = "$ENV{'HOME'}/.ssh/id_rsa" if (-s "$ENV{'HOME'}/.ssh/id_rsa");
-$keyfile = "$ENV{'HOME'}/.ssh/id_dsa" if (-s "$ENV{'HOME'}/.ssh/id_dsa");
-$keyfile = "$ENV{'HOME'}/.ssh/pb_dsa" if (-s "$ENV{'HOME'}/.ssh/pb_dsa");
-$keyfile = "$ENV{'HOME'}/.ssh/pb_ecdsa" if ((-s "$ENV{'HOME'}/.ssh/pb_ecdsa") && ($ecdsa != 0));
+        pb_system("ssh-keygen -q -b 1024 -N '' -f $ENV{'HOME'}/.ssh/pb_dsa -t dsa","Generating DSA SSH keys for pb");
+    }
+}
+
+#$keyfile = "$ENV{'HOME'}/.ssh/id_rsa" if (-s "$ENV{'HOME'}/.ssh/id_rsa");
+# We still favoud DSA and fall back to ECDSA if not available
+if ($dsa != 0) {
+    # And we favour a specific key over a generic one except if in delivery to ftp server
+    $keyfile = "$ENV{'HOME'}/.ssh/id_dsa" if ((-s "$ENV{'HOME'}/.ssh/id_dsa") && ($create eq 0));
+    $keyfile = "$ENV{'HOME'}/.ssh/pb_dsa" if (-s "$ENV{'HOME'}/.ssh/pb_dsa");
+} else {
+    # And we favour a specific key over a generic one except if in delivery to ftp server
+    $keyfile = "$ENV{'HOME'}/.ssh/id_ecdsa" if ((-s "$ENV{'HOME'}/.ssh/id_ecdsa") && ($ecdsa != 0) && ($create eq 0));
+    $keyfile = "$ENV{'HOME'}/.ssh/pb_ecdsa" if ((-s "$ENV{'HOME'}/.ssh/pb_ecdsa") && ($ecdsa != 0));
+}
 die "Unable to find your public ssh key under $ENV{'HOME'}/.ssh" if (not defined $keyfile);
+pb_log(2,"Using ssh key file $keyfile\n");
 return($keyfile);
 }
@@ -4921 +4943 @@
 my $vmhost;
 
+pb_log(1,"Entering pb_ssh_setup\n");
 ($vmhost) = pb_conf_get($vtype."host");
 # Prepare the key to be used and transfered remotely