Merge pull request #125 from QuentinPerez/local_ssh_key

fix #99

Author: moul

README.md

@@ -310,6 +310,7 @@ Options:
   -e, --env=""          Provide metadata tags passed to initrd (i.e., boot=resue INITRD_DEBUG=1)
   -h, --help=false      Print usage
   --name=""             Assign a name
+  --tmp-ssh-key=false   Access your server without uploading your SSH key to your account
   -v, --volume=""       Attach additional volume (i.e., 50G)
 
 Examples:
@@ -319,6 +320,7 @@ Examples:
     $ scw create --bootscript=3.2.34 --env="boot=live rescue_image=http://j.mp/scaleway-ubuntu-trusty-tarball" 50GB
     $ scw inspect $(scw create 1GB --bootscript=rescue --volume=50GB)
     $ scw create $(scw tag my-snapshot my-image)
+    $ scw create --tmp-ssh-key 10GB
 ```
 
 
@@ -630,6 +632,7 @@ Options:
   -h, --help=false      Print usage
   --name=""             Assign a name
   --rm=false            Automatically remove the server when it exits
+  --tmp-ssh-key=false   Access your server without uploading your SSH key to your account
   -v, --volume=""       Attach additional volume (i.e., 50G)
 
 Examples:
@@ -643,6 +646,7 @@ Examples:
     $ scw run --bootscript=3.2.34 --env="boot=live rescue_image=http://j.mp/scaleway-ubuntu-trusty-tarball" 50GB bash
     $ scw run --attach alpine
     $ scw run --detach alpine
+    $ scw run --tmp-ssh-key alpine
 ```
 
 
@@ -1084,8 +1088,9 @@ $ scw inspect myserver | jq '.[0].public_ip.address'
 
 #### Features
 
+* Support --tmp-ssh-key `scw {run,create}` option ([#99](https://github.com/scaleway/scaleway-cli/issues/99))
 * Support -f `scw run --rm` option ([#117](https://github.com/scaleway/scaleway-cli/issues/117))
-* Support of `--gateway=login@host` ([#110](https://github.com/scaleway/scaleway-cli/issues/110))p
+* Support of `--gateway=login@host` ([#110](https://github.com/scaleway/scaleway-cli/issues/110))
 * Upload local ssh key to scaleway account on `scw login` ([#100](https://github.com/scaleway/scaleway-cli/issues/100))
 * Add a 'running indicator' for `scw run`, can be disabled with the new flag `--quiet`
 * Support of `scw -V/--verbose` option ([#83](https://github.com/scaleway/scaleway-cli/issues/83))

pkg/cli/create.go

@@ -22,6 +22,7 @@ var cmdCreate = &Command{
     $ scw create --bootscript=3.2.34 --env="boot=live rescue_image=http://j.mp/scaleway-ubuntu-trusty-tarball" 50GB
     $ scw inspect $(scw create 1GB --bootscript=rescue --volume=50GB)
     $ scw create $(scw tag my-snapshot my-image)
+    $ scw create --tmp-ssh-key 10GB
 `,
 }
 
@@ -31,6 +32,7 @@ func init() {
 	cmdCreate.Flag.StringVar(&createEnv, []string{"e", "-env"}, "", "Provide metadata tags passed to initrd (i.e., boot=resue INITRD_DEBUG=1)")
 	cmdCreate.Flag.StringVar(&createVolume, []string{"v", "-volume"}, "", "Attach additional volume (i.e., 50G)")
 	cmdCreate.Flag.BoolVar(&createHelp, []string{"h", "-help"}, false, "Print usage")
+	cmdCreate.Flag.BoolVar(&createTmpSSHKey, []string{"-tmp-ssh-key"}, false, "Access your server without uploading your SSH key to your account")
 }
 
 // Flags
@@ -39,6 +41,7 @@ var createBootscript string // --bootscript flag
 var createEnv string        // -e, --env flag
 var createVolume string     // -v, --volume flag
 var createHelp bool         // -h, --help flag
+var createTmpSSHKey bool    // --tmp-ssh-key flag
 
 func runCreate(cmd *Command, rawArgs []string) {
 	if createHelp {
@@ -51,9 +54,15 @@ func runCreate(cmd *Command, rawArgs []string) {
 	args := commands.CreateArgs{
 		Name:       createName,
 		Bootscript: createBootscript,
-		Tags:       strings.Split(createEnv, " "),
-		Volumes:    strings.Split(createVolume, " "),
 		Image:      rawArgs[0],
+		TmpSSHKey:  createTmpSSHKey,
+	}
+
+	if len(runCreateEnv) > 0 {
+		args.Tags = strings.Split(runCreateEnv, " ")
+	}
+	if len(runCreateVolume) > 0 {
+		args.Volumes = strings.Split(runCreateVolume, " ")
 	}
 	ctx := cmd.GetContext(rawArgs)
 	err := commands.RunCreate(ctx, args)

pkg/cli/run.go

@@ -28,6 +28,7 @@ var cmdRun = &Command{
     $ scw run --bootscript=3.2.34 --env="boot=live rescue_image=http://j.mp/scaleway-ubuntu-trusty-tarball" 50GB bash
     $ scw run --attach alpine
     $ scw run --detach alpine
+    $ scw run --tmp-ssh-key alpine
 `,
 }
 
@@ -41,6 +42,7 @@ func init() {
 	cmdRun.Flag.BoolVar(&runDetachFlag, []string{"d", "-detach"}, false, "Run server in background and print server ID")
 	cmdRun.Flag.StringVar(&runGateway, []string{"g", "-gateway"}, "", "Use a SSH gateway")
 	cmdRun.Flag.BoolVar(&runAutoRemove, []string{"-rm"}, false, "Automatically remove the server when it exits")
+	cmdRun.Flag.BoolVar(&runTmpSSHKey, []string{"-tmp-ssh-key"}, false, "Access your server without uploading your SSH key to your account")
 	// FIXME: handle start --timeout
 }
 
@@ -54,6 +56,7 @@ var runHelpFlag bool           // -h, --help flag
 var runAttachFlag bool         // -a, --attach flag
 var runDetachFlag bool         // -d, --detach flag
 var runGateway string          // -g, --gateway flag
+var runTmpSSHKey bool          // --tmp-ssh-key flag
 
 func runRun(cmd *Command, rawArgs []string) {
 	if runHelpFlag {
@@ -83,12 +86,18 @@ func runRun(cmd *Command, rawArgs []string) {
 		Gateway:    runGateway,
 		Image:      rawArgs[0],
 		Name:       runCreateName,
-		Tags:       strings.Split(runCreateEnv, " "),
-		Volumes:    strings.Split(runCreateVolume, " "),
 		AutoRemove: runAutoRemove,
+		TmpSSHKey:  runTmpSSHKey,
 		// FIXME: DynamicIPRequired
 		// FIXME: Timeout
 	}
+
+	if len(runCreateEnv) > 0 {
+		args.Tags = strings.Split(runCreateEnv, " ")
+	}
+	if len(runCreateVolume) > 0 {
+		args.Volumes = strings.Split(runCreateVolume, " ")
+	}
 	ctx := cmd.GetContext(rawArgs)
 	err := commands.Run(ctx, args)
 	if err != nil {

pkg/commands/create.go

@@ -18,10 +18,18 @@ type CreateArgs struct {
 	Tags       []string
 	Volumes    []string
 	Image      string
+	TmpSSHKey  bool
 }
 
 // RunCreate is the handler for 'scw create'
 func RunCreate(ctx CommandContext, args CreateArgs) error {
+	if args.TmpSSHKey {
+		err := AddSSHKeyToTags(ctx, &args.Tags, args.Image)
+		if err != nil {
+			return err
+		}
+	}
+
 	env := strings.Join(args.Tags, " ")
 	volume := strings.Join(args.Volumes, " ")
 	serverID, err := api.CreateServer(ctx.API, args.Image, args.Name, args.Bootscript, env, volume, true)
@@ -30,6 +38,5 @@ func RunCreate(ctx CommandContext, args CreateArgs) error {
 	}
 
 	fmt.Fprintln(ctx.Stdout, serverID)
-
 	return nil
 }

pkg/commands/run.go

@@ -6,6 +6,9 @@ package commands
 
 import (
 	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
 	"strings"
 
 	"github.com/scaleway/scaleway-cli/pkg/api"
@@ -25,16 +28,53 @@ type RunArgs struct {
 	Tags       []string
 	Volumes    []string
 	AutoRemove bool
+	TmpSSHKey  bool
 	// DynamicIPRequired
 	// Timeout
 }
 
+// AddSSHKeyToTags adds the ssh key in the tags
+func AddSSHKeyToTags(ctx CommandContext, tags *[]string, image string) error {
+	home, err := utils.GetHomeDir()
+	if err != nil {
+		return fmt.Errorf("unable to find your home %v", err)
+	}
+	idRsa := filepath.Join(home, ".ssh", "id_rsa")
+	if _, err := os.Stat(idRsa); err != nil {
+		if os.IsNotExist(err) {
+			logrus.Warnln("Unable to find your ~/.ssh/id_rsa")
+			logrus.Warnln("Run 'ssh-keygen -t rsa'")
+			return nil
+		}
+	}
+	idRsa = strings.Join([]string{idRsa, ".pub"}, "")
+	data, err := ioutil.ReadFile(idRsa)
+	if err != nil {
+		return fmt.Errorf("failed to read %v", err)
+	}
+	data[7] = '_'
+	for i := range data {
+		if data[i] == ' ' {
+			data = data[:i]
+			break
+		}
+	}
+	*tags = append(*tags, strings.Join([]string{"AUTHORIZED_KEY", string(data[:len(data)])}, "="))
+	return nil
+}
+
 // Run is the handler for 'scw run'
 func Run(ctx CommandContext, args RunArgs) error {
 	if args.Gateway == "" {
 		args.Gateway = ctx.Getenv("SCW_GATEWAY")
 	}
 
+	if args.TmpSSHKey {
+		err := AddSSHKeyToTags(ctx, &args.Tags, args.Image)
+		if err != nil {
+			return err
+		}
+	}
 	env := strings.Join(args.Tags, " ")
 	volume := strings.Join(args.Volumes, " ")
 

pkg/utils/utils.go

@@ -10,6 +10,7 @@ package utils
 import (
 	"errors"
 	"fmt"
+	"io"
 	"net"
 	"os"
 	"os/exec"
@@ -23,6 +24,13 @@ import (
 	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
 )
 
+// SpawnRedirection is used to redirects the fluxes
+type SpawnRedirection struct {
+	Stdin  io.Reader
+	Stdout io.Writer
+	Stderr io.Writer
+}
+
 // SSHExec executes a command over SSH and redirects file-descriptors
 func SSHExec(publicIPAddress string, privateIPAddress string, command []string, checkConnection bool, gateway string) error {
 	gatewayUser := "root"
@@ -89,6 +97,28 @@ func NewSSHExecCmd(publicIPAddress string, privateIPAddress string, allocateTTY
 	return sshCommand
 }
 
+// GeneratingAnSSHKey generates an SSH key
+func GeneratingAnSSHKey(cfg SpawnRedirection, path string, name string) (string, error) {
+	args := []string{
+		"-t",
+		"rsa",
+		"-b",
+		"4096",
+		"-f",
+		filepath.Join(path, name),
+		"-N",
+		"",
+		"-C",
+		"",
+	}
+	log.Infof("Executing commands %v", args)
+	spawn := exec.Command("ssh-keygen", args...)
+	spawn.Stdout = cfg.Stdout
+	spawn.Stdin = cfg.Stdin
+	spawn.Stderr = cfg.Stderr
+	return args[5], spawn.Run()
+}
+
 // WaitForTCPPortOpen calls IsTCPPortOpen in a loop
 func WaitForTCPPortOpen(dest string) error {
 	for {