update

Author: takara9

pkg/ckecli/cmd/scp.go

@@ -28,17 +28,17 @@ func detectSCPNode(args []string) (string, error) {
 }
 
 func scpSubMain(ctx context.Context, args []string) error {
-	//pipeFilename, err := createFifo()
-	//if err != nil {
-	//	return err
-	//}
+	pipeFilename, err := createFifo2()
+	if err != nil {
+		return err
+	}
 
 	node, err := detectSCPNode(args)
 	if err != nil {
 		return err
 	}
 
-	pipeFilename, pirvateKey, err := getPrivateKey(node)
+	pirvateKey, err := getPrivateKey(node)
 	if err != nil {
 		return err
 	}
@@ -56,7 +56,6 @@ func scpSubMain(ctx context.Context, args []string) error {
 	defer os.Remove(pipeFilename)
 	defer killSshAgent(ctx)
 
-	//return scp(ctx, args)
 	scpArgs := []string{
 		"-o", "UserKnownHostsFile=/dev/null",
 		"-o", "StrictHostKeyChecking=no",
@@ -74,6 +73,26 @@ func scpSubMain(ctx context.Context, args []string) error {
 	return c.Run()
 }
 
+/*
+func scp(ctx context.Context, args []string) error {
+	scpArgs := []string{
+		"-o", "UserKnownHostsFile=/dev/null",
+		"-o", "StrictHostKeyChecking=no",
+		"-o", "ConnectTimeout=60",
+	}
+	if scpParams.recursive {
+		scpArgs = append(scpArgs, "-r")
+	}
+
+	scpArgs = append(scpArgs, args...)
+	c := exec.CommandContext(ctx, "scp", scpArgs...)
+	c.Stdin = os.Stdin
+	c.Stdout = os.Stdout
+	c.Stderr = os.Stderr
+	return c.Run()
+}
+*/
+
 var scpParams struct {
 	recursive bool
 }

pkg/ckecli/cmd/ssh.go

@@ -26,8 +26,7 @@ func detectSSHNode(arg string) string {
 	return nodeName
 }
 
-/*
-func createFifo() (string, error) {
+func createFifo2() (string, error) {
 	usr, err := user.Current()
 	if err != nil {
 		return "", err
@@ -54,64 +53,39 @@ func createFifo() (string, error) {
 
 	return fifoFilePath, err
 }
-*/
-
-func getPrivateKey(nodeName string) (string, []byte, error) {
-	usr, err := user.Current()
-	if err != nil {
-		return "", nil, err
-	}
-
-	fifoFilePath := filepath.Join(usr.HomeDir, ".ssh", "ckecli-ssh-key-"+strconv.Itoa(os.Getpid()))
-	_, err = os.Stat(fifoFilePath)
-	//if os.IsExist(err) {
-	//	return fifoFilePath, nil
-	//}
-	if !os.IsNotExist(err) {
-		return "", nil, err
-	}
-
-	err = os.MkdirAll(filepath.Join(usr.HomeDir, ".ssh"), 0700)
-	if err != nil {
-		return "", nil, err
-	}
-
-	err = syscall.Mkfifo(fifoFilePath, 0600)
-	if err != nil {
-		return "", nil, err
-	}
 
+func getPrivateKey(nodeName string) ([]byte, error) {
 	vc, err := inf.Vault()
 	if err != nil {
-		return "", nil, err
+		return nil, err
 	}
 	secret, err := vc.Logical().Read(cke.SSHSecret)
 	if err != nil {
-		return "", nil, err
+		return nil, err
 	}
 	if secret == nil {
-		return "", nil, errors.New("no ssh private keys")
+		return nil, errors.New("no ssh private keys")
 	}
 	privKeys := secret.Data
-	mykey, ok := privKeys[nodeName]
-	fmt.Println("nodeName=", nodeName)
-	//fmt.Println("mykey (string)=", mykey.(string))
-	//fmt.Println("mykey (bin)=", mykey)
-	//fmt.Println("ok=", ok)
-	//fmt.Printf("mykey type= %T\n", mykey)
 
+	mykey, ok := privKeys[nodeName]
 	if !ok {
 		mykey = privKeys[""]
 	}
 	if mykey == nil {
-		return "", nil, errors.New("no ssh private key for " + nodeName)
-	}
-	if b, ok := mykey.([]byte); ok {
-		return "", b, nil
-	}
-	return "", nil, errors.New("no []byte key for " + nodeName)
-	//return mykey.([]byte), nil
-	//return []byte(mykey), nil
+		return nil, errors.New("no ssh private key for " + nodeName)
+	}
+	/*
+		go func() {
+			// OpenSSH reads the private key file three times, it need to write key three times.
+			writeToFifo(fifo, mykey.(string))
+			time.Sleep(100 * time.Millisecond)
+			writeToFifo(fifo, mykey.(string))
+			time.Sleep(100 * time.Millisecond)
+			writeToFifo(fifo, mykey.(string))
+		}()
+	*/
+	return mykey.([]byte), nil
 }
 
 func sshAgent(ctx context.Context, privateKeyFile string) (map[string]string, error) {
@@ -190,20 +164,16 @@ func writeToFifo(fifo string, data []byte) error {
 }
 
 func sshSubMain(ctx context.Context, args []string) error {
-	//pipeFilename, err := createFifo()
-	//if err != nil {
-	//	return err
-	//}
-	//fmt.Println("pipeFilename=",pipeFilename)
+	pipeFilename, err := createFifo2()
+	if err != nil {
+		return err
+	}
 
 	node := detectSSHNode(args[0])
-	fmt.Println("node=", node)
-
-	pipeFilename, pirvateKey, err := getPrivateKey(node)
+	pirvateKey, err := getPrivateKey(node)
 	if err != nil {
 		return err
 	}
-	fmt.Println("privateKey=", pirvateKey)
 
 	go func() {
 		if _, err := sshAgent(ctx, pipeFilename); err != nil {
@@ -219,6 +189,7 @@ func sshSubMain(ctx context.Context, args []string) error {
 	defer os.Remove(pipeFilename)
 	defer killSshAgent(ctx)
 
+	//return ssh(ctx, args)
 	sshArgs := []string{
 		"-o", "UserKnownHostsFile=/dev/null",
 		"-o", "StrictHostKeyChecking=no",
@@ -232,6 +203,22 @@ func sshSubMain(ctx context.Context, args []string) error {
 	return c.Run()
 }
 
+/*
+func ssh(ctx context.Context, args []string) (error, string) {
+	sshArgs := []string{
+		"-o", "UserKnownHostsFile=/dev/null",
+		"-o", "StrictHostKeyChecking=no",
+		"-o", "ConnectTimeout=60",
+	}
+	sshArgs = append(sshArgs, args...)
+	c := exec.CommandContext(ctx, "ssh", sshArgs...)
+	c.Stdin = os.Stdin
+	c.Stdout = os.Stdout
+	c.Stderr = os.Stderr
+	return c.Run(), "OK"
+}
+*/
+
 // sshCmd represents the ssh command
 var sshCmd = &cobra.Command{
 	Use:   "ssh [user@]NODE [COMMAND...]",