Merge b08f1ba into b6a3797

api/v1/cmd/msh/msh.go

@@ -10,6 +10,7 @@ package main
 //
 
 import (
+	"bytes"
 	"context"
 	"flag"
 	"fmt"
@@ -342,6 +343,7 @@ func tryInteractive(agentHost string, cid mesos.ContainerID) (err error) {
 
 		go func() {
 			<-ctx.Done()
+			//println("closing ttyd via ctx.Done")
 			ttyd.Close()
 		}()
 
@@ -396,11 +398,18 @@ func attachContainerInput(ctx context.Context, stdin io.Reader, winCh <-chan mes
 	input := make(chan []byte)
 	go func() {
 		defer close(input)
+		escape := []byte{0x10, 0x11} // CTRL-P, CTRL-Q
+		var last byte
 		for {
 			buf := make([]byte, 512) // not efficient to always do this
 			n, err := stdin.Read(buf)
 			if n > 0 {
+				if (last == escape[0] && buf[0] == escape[1]) || bytes.Index(buf, escape) > -1 {
+					//println("escape sequence detected")
+					return
+				}
 				buf = buf[:n]
+				last = buf[n-1]
 				select {
 				case input <- buf:
 				case <-ctx.Done():

api/v1/cmd/msh/tty.go

@@ -166,7 +166,7 @@ func ttyWinch(tty *ttyDevice) {
 		Columns: uint32(tty.original_winsize.ws_col),
 	}
 	go func() {
-		defer signal.Ignore(os.Signal(syscall.SIGWINCH))
+		defer signal.Reset(os.Signal(syscall.SIGWINCH))
 		for {
 			select {
 			case <-c:
@@ -195,13 +195,23 @@ func ttyWinch(tty *ttyDevice) {
 }
 
 func ttyTermReset(tty *ttyDevice) {
-	// cleanup properly upon SIGTERM
-	term := make(chan os.Signal, 1)
+	var (
+		// cleanup properly upon SIGTERM
+		term = make(chan os.Signal, 1)
+		done = make(chan struct{})
+	)
 	go func() {
-		<-term
-		tty.cleanups.unwind()
-		os.Exit(0)
+		select {
+		case <-term:
+			tty.cleanups.unwind()
+			os.Exit(0)
+		case <-done:
+			//println("stop waiting for SIGTERM")
+		}
 	}()
-	tty.cleanups.push(func() { signal.Ignore(os.Signal(syscall.SIGTERM)) })
+	tty.cleanups.push(func() {
+		signal.Reset(os.Signal(syscall.SIGTERM))
+		close(done) // stop waiting for a signal
+	})
 	signal.Notify(term, os.Signal(syscall.SIGTERM))
 }