Changeset 2047 in ProjectBuilder

Timestamp:

Feb 20, 2016, 1:05:18 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

File:

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

devel/pb/bin/pb

@@ -2807 +2807 @@
 $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");
@@ -4486 +4487 @@
 # 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>) {
@@ -4492 +4494 @@
 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>) {
+    $ecdsa = 1 if ($_ =~ /ecdsa-/);
+}
+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) {
+    $keyfile = "$ENV{'HOME'}/.ssh/id_dsa" if (-s "$ENV{'HOME'}/.ssh/id_dsa") ;
+    # And we favour a specific key over a generic one
+    $keyfile = "$ENV{'HOME'}/.ssh/pb_dsa" if (-s "$ENV{'HOME'}/.ssh/pb_dsa");
+} else {
+    $keyfile = "$ENV{'HOME'}/.ssh/id_ecdsa" if ((-s "$ENV{'HOME'}/.ssh/id_ecdsa") && ($ecdsa != 0));
+    # And we favour a specific key over a generic one
+    $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);
 return($keyfile);