rework ssh 'init' command

ssh.go

@@ -9,9 +9,10 @@ import (
 	"os/exec"
 	"sync"
 	"syscall"
+	"time"
 	"unsafe"
 
-	"github.com/kr/pty"
+	"github.com/creack/pty"
 	"github.com/rs/zerolog/log"
 	"golang.org/x/crypto/ssh"
 
@@ -142,14 +143,35 @@ func sshHandleChannel(remoteAddr string, channel ssh.Channel, requests <-chan *s
 			command := string(req.Payload[4 : req.Payload[3]+4])
 			switch command {
 			case "init":
-				go func() {
-					io.Copy(channel, stdout.NewReader())
-					once.Do(closeCh)
-				}()
-				go func() {
-					io.Copy(stdinPipe, channel)
-					once.Do(closeCh)
-				}()
+				if ptyF == nil {
+					go func() {
+						channel.Stderr().Write([]byte("\033[5m\033[31;1m\n\nWARNING: no TTY requested, passwords will be echoed!\n\n\033[0m"))
+						time.Sleep(3 * time.Second)
+						io.Copy(channel, stdout.NewReader())
+						once.Do(closeCh)
+					}()
+					go func() {
+						io.Copy(stdinPipe, channel)
+						once.Do(closeCh)
+					}()
+
+				} else {
+					stdinTTY := newTTY(ptyF.Fd())
+					if askingSecret.Load() {
+						stdinTTY.EchoOff()
+					}
+					registerInput(stdinTTY)
+					defer unregiterInput(stdinTTY)
+
+					go func() {
+						io.Copy(ttyF, stdout.NewReader())
+						once.Do(closeCh)
+					}()
+					go func() {
+						io.Copy(stdinPipe, ttyF)
+						once.Do(closeCh)
+					}()
+				}
 
 				req.Reply(true, nil)
 
@@ -195,15 +217,6 @@ func sshHandleChannel(remoteAddr string, channel ssh.Channel, requests <-chan *s
 				ttyF = nil
 			}()
 
-			go func() {
-				io.Copy(channel, ptyF)
-				once.Do(closeCh)
-			}()
-			go func() {
-				io.Copy(ptyF, channel)
-				once.Do(closeCh)
-			}()
-
 			req.Reply(true, nil)
 
 		case "pty-req":
@@ -227,6 +240,15 @@ func sshHandleChannel(remoteAddr string, channel ssh.Channel, requests <-chan *s
 
 			req.Reply(true, nil)
 
+			go func() {
+				io.Copy(channel, ptyF)
+				once.Do(closeCh)
+			}()
+			go func() {
+				io.Copy(ptyF, channel)
+				once.Do(closeCh)
+			}()
+
 		case "window-change":
 			w, h := sshParseDims(req.Payload)
 			sshSetWinsize(ptyF.Fd(), w, h)