Adding client authentication with public key fuction.

.vscode/settings.json

@@ -12,7 +12,8 @@
   "json.schemas": [
     {
       "fileMatch": [
-        "/templates/**/*.json"
+        "/templates/**/*.json",
+        "/ci/citest/acceptance-test/tests/fixtures/**/*.json"
       ],
       "url": "./schema/v1.json"
     }

api/instance_service.go

@@ -244,11 +244,14 @@ func (s *InstanceAPI) Console(ctx context.Context, in *ConsoleRequest) (*Console
 		log.WithError(err).WithField("instance_id", in.GetInstanceId()).Error("Failed to find the instance")
 		return nil, err
 	}
+	instResource := inst.ResourceTemplate().(model.InstanceResource)
+	authType := instResource.GetAuthenticationType()
 
 	return &ConsoleReply{
 		InstanceId: instanceID,
 		Type:       node.Console.Type,
 		Address:    node.Console.BindAddr,
+		AuthType:   authType,
 	}, nil
 }
 

ci/citest/acceptance-test/tests/00_ssh.go

@@ -4,10 +4,12 @@ package tests
 
 import (
 	"bytes"
-	"golang.org/x/crypto/ssh"
 	"testing"
 	"time"
+
+	"golang.org/x/crypto/ssh"
 )
+
 const zookeeper_ip = "10.0.100.10"
 const mesos_master_ip = "10.0.100.11"
 const scheduler_ip = "10.0.100.12"
@@ -26,6 +28,7 @@ func RunSsh(ip string, cmd string) (*bytes.Buffer, *bytes.Buffer, error) {
 		Auth: []ssh.AuthMethod{
 			ssh.Password("kemumaki"),
 		},
+		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
 	}
 
 	connection, err := ssh.Dial("tcp", ip+":22", sshConfig)

ci/citest/acceptance-test/tests/cmd_console_test.go

@@ -4,6 +4,7 @@ package tests
 
 import (
 	"fmt"
+	"io/ioutil"
 	"strings"
 	"testing"
 	"time"
@@ -21,6 +22,24 @@ func runConsoleCmd(instance_id string, t *testing.T) {
 	RunCmdAndExpectFail(t, "sh", "-c", fmt.Sprintf("openvdc console %s -- false", instance_id))
 }
 
+func runConsoleCmdWithPrivatekey(instance_id string, private_key_path string, t *testing.T, expect_fail bool) {
+	if expect_fail {
+		RunCmdAndExpectFail(t, "openvdc", "console", instance_id, "-i", private_key_path)
+	} else {
+		RunCmdAndReportFail(t, "openvdc", "console", instance_id, "-i", private_key_path)
+	}
+}
+
+func TestCmdConsole_ShowOptionAuthenticationNone(t *testing.T) {
+	stdout, _ := RunCmdAndReportFail(t, "openvdc", "run", "centos/7/lxc", `{"authentication_type":"none"}`)
+	instance_id := strings.TrimSpace(stdout.String())
+	WaitInstance(t, 5*time.Minute, instance_id, "RUNNING", []string{"QUEUED", "STARTING"})
+	runConsoleCmd(instance_id, t)
+	runConsoleCmdPiped(instance_id, t)
+	RunCmdWithTimeoutAndReportFail(t, 10, 5, "openvdc", "destroy", instance_id)
+	WaitInstance(t, 5*time.Minute, instance_id, "TERMINATED", nil)
+}
+
 func TestLXCCmdConsole_ShowOption(t *testing.T) {
 	stdout, _ := RunCmdAndReportFail(t, "openvdc", "run", "centos/7/lxc")
 	instance_id := strings.TrimSpace(stdout.String())
@@ -31,6 +50,37 @@ func TestLXCCmdConsole_ShowOption(t *testing.T) {
 	WaitInstance(t, 5*time.Minute, instance_id, "TERMINATED", nil)
 }
 
+func TestLXCCmdConsole_AuthenticationPubkey(t *testing.T) {
+	// Make key pair by ssh-keygen
+	private_key_path := "./testRsa"
+	private_key_path2 := "./testRsa2"
+	_, _, err := RunCmd("ssh-keygen", "-t", "rsa", "-f", private_key_path, "-C", "", "-N", "")
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+	_, _, err = RunCmd("ssh-keygen", "-t", "rsa", "-f", private_key_path2, "-C", "", "-N", "")
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	// Read public key
+	data, err := ioutil.ReadFile(private_key_path + ".pub")
+	if err != nil {
+		t.Fatalf("Can not read public key: %s\n", err.Error())
+	}
+	public_key := strings.Replace(string(data), "\n", "", -1)
+	stdout, _ := RunCmdAndReportFail(t, "openvdc", "run", "centos/7/lxc", `{"authentication_type":"pub_key","ssh_public_key":"`+public_key+`"}`)
+
+	// runConsole()
+	instance_id := strings.TrimSpace(stdout.String())
+	WaitInstance(t, 5*time.Minute, instance_id, "RUNNING", []string{"QUEUED", "STARTING"})
+	runConsoleCmdWithPrivatekey(instance_id, private_key_path, t, false)
+	runConsoleCmdWithPrivatekey(instance_id, private_key_path2, t, true) // This can not be authenticated.
+	//vrunConsoleCmdPiped(instance_id, t)
+	RunCmdWithTimeoutAndReportFail(t, 10, 5, "openvdc", "destroy", instance_id)
+	WaitInstance(t, 5*time.Minute, instance_id, "TERMINATED", nil)
+}
+
 func TestQEMUCmdConsole_ShowOption(t *testing.T) {
 	stdout, _ := RunCmdAndReportFail(t, "openvdc", "run", "centos/7/qemu_ga")
 	instance_id := strings.TrimSpace(stdout.String())

ci/citest/acceptance-test/tests/fixtures/lxc_auth_ssh.json

@@ -0,0 +1,14 @@
+{
+  "title": "CentOS7",
+  "template": {
+    "type": "vm/lxc",
+    "lxc_template": {
+      "openvdc": {
+        "distro": "centos",
+        "release": "7"
+      }
+    },
+    "authentication_type": "none"
+  }
+}
+