22 bug creating a machine is weird if user tries to put spaces in the…

… name (#23)

* add comment explaining issue

* use bufio scanner instead of fmt.scanln

pkg/actions/challenge-response.go

@@ -1,6 +1,7 @@
 package actions
 
 import (
+	"bufio"
 	"context"
 	"fmt"
 	"net/http"
@@ -46,8 +47,9 @@ func ChallengeResponse(c *cli.Context) error {
 	}
 	defer conn.Close()
 	fmt.Print("Please enter the challenge phrase: ")
+	scanner := bufio.NewScanner(os.Stdin)
 	var answer string
-	if _, err := fmt.Scanln(&answer); err != nil {
+	if err := utils.ReadLineFromStdin(scanner, &answer); err != nil {
 		return err
 	}
 	if err := utils.WriteClientMessage(&conn, dto.ChallengeResponseDto{

pkg/actions/remove-machine.go

@@ -1,6 +1,7 @@
 package actions
 
 import (
+	"bufio"
 	"bytes"
 	"encoding/json"
 	"fmt"
@@ -26,8 +27,9 @@ func RemoveMachine(c *cli.Context) error {
 		return err
 	}
 	fmt.Print("Please enter the machine name: ")
+	scanner := bufio.NewScanner(os.Stdin)
 	var answer string
-	if _, err := fmt.Scanln(&answer); err != nil {
+	if err := utils.ReadLineFromStdin(scanner, &answer); err != nil {
 		return err
 	}
 	buf := new(bytes.Buffer)

pkg/actions/reset.go

@@ -1,6 +1,7 @@
 package actions
 
 import (
+	"bufio"
 	"bytes"
 	"encoding/json"
 	"fmt"
@@ -24,8 +25,9 @@ func Reset(c *cli.Context) error {
 		return nil
 	}
 	fmt.Print("This will delete all ssh-sync data relating to this machine. Continue? (y/n): ")
+	scanner := bufio.NewScanner(os.Stdin)
 	var answer string
-	if _, err := fmt.Scanln(&answer); err != nil {
+	if err := utils.ReadLineFromStdin(scanner, &answer); err != nil {
 		return err
 	}
 	if answer != "y" {

pkg/actions/setup.go

@@ -1,6 +1,7 @@
 package actions
 
 import (
+	"bufio"
 	"bytes"
 	"context"
 	"crypto/ecdsa"
@@ -180,10 +181,11 @@ func createMasterKey() ([]byte, error) {
 }
 
 func newAccountSetup(serverUrl *url.URL) error {
+	scanner := bufio.NewScanner(os.Stdin)
 	// ask user to pick a username.
 	fmt.Print("Please enter a username. This will be used to identify your account on the server: ")
 	var username string
-	_, err := fmt.Scanln(&username)
+	err := utils.ReadLineFromStdin(scanner, &username)
 	if err != nil {
 		return err
 	}
@@ -197,7 +199,7 @@ func newAccountSetup(serverUrl *url.URL) error {
 	// ask user to pick a name for this machine (default to current system name)
 	fmt.Print("Please enter a name for this machine: ")
 	var machineName string
-	if _, err := fmt.Scanln(&machineName); err != nil {
+	if err := utils.ReadLineFromStdin(scanner, &machineName); err != nil {
 		return err
 	}
 	// then the program will generate a keypair, and upload the public key to the server
@@ -250,9 +252,10 @@ func newAccountSetup(serverUrl *url.URL) error {
 }
 
 func existingAccountSetup(serverUrl *url.URL) error {
+	scanner := bufio.NewScanner(os.Stdin)
 	fmt.Print("Please enter a username. This will be used to identify your account on the server: ")
 	var username string
-	_, err := fmt.Scanln(&username)
+	err := utils.ReadLineFromStdin(scanner, &username)
 	if err != nil {
 		return err
 	}
@@ -265,7 +268,7 @@ func existingAccountSetup(serverUrl *url.URL) error {
 	}
 	fmt.Print("Please enter a name for this machine: ")
 	var machineName string
-	if _, err := fmt.Scanln(&machineName); err != nil {
+	if err := utils.ReadLineFromStdin(scanner, &machineName); err != nil {
 		return err
 	}
 	wsUrl := *serverUrl
@@ -331,6 +334,7 @@ func existingAccountSetup(serverUrl *url.URL) error {
 }
 
 func Setup(c *cli.Context) error {
+	scanner := bufio.NewScanner(os.Stdin)
 	// all files will be stored in ~/.ssh-sync
 	// there will be a profile.json file containing the machine name and the username
 	// there will also be a keypair.
@@ -348,7 +352,7 @@ func Setup(c *cli.Context) error {
 	// ask user if they already have an account on the ssh-sync server.
 	fmt.Print("Please enter your server address (http/https): ")
 	var serverAddress string
-	if _, err := fmt.Scanln(&serverAddress); err != nil {
+	if err := utils.ReadLineFromStdin(scanner, &serverAddress); err != nil {
 		return err
 	}
 	serverUrl, err := url.Parse(serverAddress)
@@ -369,7 +373,7 @@ func Setup(c *cli.Context) error {
 	}
 	fmt.Print("Do you already have an account on the ssh-sync server? (y/n): ")
 	var answer string
-	if _, err := fmt.Scanln(&answer); err != nil {
+	if err := utils.ReadLineFromStdin(scanner, &answer); err != nil {
 		return err
 	}
 	if answer == "y" {

pkg/utils/io.go

@@ -0,0 +1,17 @@
+package utils
+
+import (
+	"bufio"
+	"os"
+)
+
+func ReadLineFromStdin(reader *bufio.Scanner, input *string) error {
+	if reader == nil {
+		reader = bufio.NewScanner(os.Stdin)
+	}
+	if reader.Scan() {
+		*input = reader.Text()
+		return nil
+	}
+	return reader.Err()
+}