ssh: workaround to not block Stdin from returning corrrectly

Assign session.stdin using StdinPipe() to avoid cases of ssh connetions being blocked on user input. WIP. Reported-by: kayrus <[email protected]> maybe partly resolves coreos#1499
endocode · Jun 24, 2016 · 6dc4357 · 6dc4357
1 parent e4f2123
commit 6dc4357
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/ssh/ssh.go b/ssh/ssh.go
@@ -16,6 +16,7 @@ package ssh
 
 import (
 	"errors"
+	"io"
 	"net"
 	"os"
 	"strconv"
@@ -72,7 +73,17 @@ func makeSession(client *SSHForwardingClient) (session *gossh.Session, finalize
 
 	session.Stdout = os.Stdout
 	session.Stderr = os.Stderr
-	session.Stdin = os.Stdin
+
+	// Workaround to not prevent Stdin from returning.
+	inPipe, err := session.StdinPipe()
+	if err != nil {
+		return
+	}
+
+	go func() {
+		io.Copy(inPipe, os.Stdin)
+		inPipe.Close()
+	}()
 
 	modes := gossh.TerminalModes{
 		gossh.ECHO:          1,     // enable echoing