Merge pull request #261 from QuentinPerez/fix_#194

Fix #194 1/2

Author: moul

README.md

@@ -1154,7 +1154,8 @@ $ scw inspect myserver | jq '.[0].public_ip.address'
 
 ### master (unreleased)
 
-# Add a warn message when using `ssh exec` on host without public ip nor gateway ([#171](https://github.com/scaleway/scaleway-cli/issues/171))
+* Add a warn message when using `ssh exec` on host without public ip nor gateway ([#171](https://github.com/scaleway/scaleway-cli/issues/171))
+* Display `ssh-host-fingerprints` when it's available ([#194](https://github.com/scaleway/scaleway-cli/issues/194))
 * Support of `scw rmi` snapshot|volume ([#258](https://github.com/scaleway/scaleway-cli/issues/258))
 * Match bootscript/image with the good architecture ([#255](https://github.com/scaleway/scaleway-cli/issues/255))
 * Support of region/owner/arch in the cache file ([#255](https://github.com/scaleway/scaleway-cli/issues/255))

pkg/api/helpers.go

@@ -601,3 +601,18 @@ func (a *ScalewayAPI) DeleteServerSafe(serverID string) error {
 	logrus.Errorf("Try to run 'scw rm -f %s' later", serverID)
 	return err
 }
+
+// GetSSHFingerprintFromServer returns an array which containts ssh-host-fingerprints
+func (a *ScalewayAPI) GetSSHFingerprintFromServer(serverID string) []string {
+	ret := []string{}
+
+	if value, err := a.GetUserdata(serverID, "ssh-host-fingerprints"); err == nil {
+		PublicKeys := strings.Split(string(*value), "\n")
+		for i := range PublicKeys {
+			if fingerprint, err := utils.SSHGetFingerprint([]byte(PublicKeys[i])); err == nil {
+				ret = append(ret, fingerprint)
+			}
+		}
+	}
+	return ret
+}

pkg/commands/exec.go

@@ -25,11 +25,19 @@ type ExecArgs struct {
 
 // RunExec is the handler for 'scw exec'
 func RunExec(ctx CommandContext, args ExecArgs) error {
+	var fingerprints []string
+
+	done := make(chan struct{})
+
 	serverID, err := ctx.API.GetServerID(args.Server)
 	if err != nil {
 		return err
 	}
 
+	go func() {
+		fingerprints = ctx.API.GetSSHFingerprintFromServer(serverID)
+		close(done)
+	}()
 	// Resolve gateway
 	if args.Gateway == "" {
 		args.Gateway = ctx.Getenv("SCW_GATEWAY")
@@ -80,8 +88,13 @@ func RunExec(ctx CommandContext, args ExecArgs) error {
 		}()
 	}
 
-	err = utils.SSHExec(server.PublicAddress.IP, server.PrivateIP, args.Command, !args.Wait, gateway)
-	if err != nil {
+	<-done
+	if len(fingerprints) > 0 {
+		for i := range fingerprints {
+			fmt.Fprintf(ctx.Stdout, "%s\n", fingerprints[i])
+		}
+	}
+	if err = utils.SSHExec(server.PublicAddress.IP, server.PrivateIP, args.Command, !args.Wait, gateway); err != nil {
 		return fmt.Errorf("Failed to run the command: %v", err)
 	}
 

pkg/commands/run.go

@@ -96,6 +96,50 @@ func addUserData(ctx CommandContext, userdatas []string, serverID string) {
 	}
 }
 
+func runShowBoot(ctx CommandContext, args RunArgs, serverID string, closeTimeout chan struct{}, timeoutExit chan struct{}) error {
+	// Attach to server serial
+	logrus.Info("Attaching to server console ...")
+	gottycli, done, err := utils.AttachToSerial(serverID, ctx.API.Token)
+	if err != nil {
+		close(closeTimeout)
+		return fmt.Errorf("cannot attach to server serial: %v", err)
+	}
+	utils.Quiet(true)
+	notif, gateway, err := waitSSHConnection(ctx, args, serverID)
+	if err != nil {
+		close(closeTimeout)
+		gottycli.ExitLoop()
+		<-done
+		return err
+	}
+	select {
+	case <-timeoutExit:
+		gottycli.ExitLoop()
+		<-done
+		utils.Quiet(false)
+		return fmt.Errorf("Operation timed out")
+	case sshConnection := <-notif:
+		close(closeTimeout)
+		gottycli.ExitLoop()
+		<-done
+		utils.Quiet(false)
+		if sshConnection.err != nil {
+			return sshConnection.err
+		}
+		if fingerprints := ctx.API.GetSSHFingerprintFromServer(serverID); len(fingerprints) > 0 {
+			for i := range fingerprints {
+				fmt.Fprintf(ctx.Stdout, "%s\n", fingerprints[i])
+			}
+		}
+		server := sshConnection.server
+		logrus.Info("Connecting to server ...")
+		if err = utils.SSHExec(server.PublicAddress.IP, server.PrivateIP, []string{}, false, gateway); err != nil {
+			return fmt.Errorf("Connection to server failed: %v", err)
+		}
+	}
+	return nil
+}
+
 // Run is the handler for 'scw run'
 func Run(ctx CommandContext, args RunArgs) error {
 	if args.Gateway == "" {
@@ -163,41 +207,7 @@ func Run(ctx CommandContext, args RunArgs) error {
 		}()
 	}
 	if args.ShowBoot {
-		// Attach to server serial
-		logrus.Info("Attaching to server console ...")
-		gottycli, done, err := utils.AttachToSerial(serverID, ctx.API.Token)
-		if err != nil {
-			close(closeTimeout)
-			return fmt.Errorf("cannot attach to server serial: %v", err)
-		}
-		utils.Quiet(true)
-		notif, gateway, err := waitSSHConnection(ctx, args, serverID)
-		if err != nil {
-			close(closeTimeout)
-			gottycli.ExitLoop()
-			<-done
-			return err
-		}
-		select {
-		case <-timeoutExit:
-			gottycli.ExitLoop()
-			<-done
-			utils.Quiet(false)
-			return fmt.Errorf("Operation timed out")
-		case sshConnection := <-notif:
-			close(closeTimeout)
-			gottycli.ExitLoop()
-			<-done
-			utils.Quiet(false)
-			if sshConnection.err != nil {
-				return sshConnection.err
-			}
-			server := sshConnection.server
-			logrus.Info("Connecting to server ...")
-			if err = utils.SSHExec(server.PublicAddress.IP, server.PrivateIP, []string{}, false, gateway); err != nil {
-				return fmt.Errorf("Connection to server failed: %v", err)
-			}
-		}
+		return runShowBoot(ctx, args, serverID, closeTimeout, timeoutExit)
 	} else if args.Attach {
 		// Attach to server serial
 		logrus.Info("Attaching to server console ...")
@@ -222,6 +232,11 @@ func Run(ctx CommandContext, args RunArgs) error {
 			if sshConnection.err != nil {
 				return sshConnection.err
 			}
+			if fingerprints := ctx.API.GetSSHFingerprintFromServer(serverID); len(fingerprints) > 0 {
+				for i := range fingerprints {
+					fmt.Fprintf(ctx.Stdout, "%s\n", fingerprints[i])
+				}
+			}
 			server := sshConnection.server
 			// exec -w SERVER COMMAND ARGS...
 			if len(args.Command) < 1 {