Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 34 additions & 13 deletions cmd/sandbox/process.go
Original file line number Diff line number Diff line change
Expand Up @@ -1071,18 +1071,29 @@ func copyProcessInput(ctx context.Context, detach context.CancelFunc, nextCh cha
if n > 0 {
chunk := buf[:n]
if pty {
if before, action, found := splitOnPTYShortcut(chunk); found {
for len(chunk) > 0 {
before, action, after, found := splitOnPTYControl(chunk)
if !found {
writeProcessInputBytes(ctx, client, sandboxID, processID, chunk)
break
}
if len(before) > 0 {
encoded := base64.StdEncoding.EncodeToString(before)
_, _ = client.WriteProcessInput(ctx, sandboxID, processID, api.ProcessInputRequest{DataBase64: encoded}) //nolint:errcheck
writeProcessInputBytes(ctx, client, sandboxID, processID, before)
}
if action == "interrupt" {
_ = client.SignalProcess(ctx, sandboxID, processID, api.ProcessSignalRequest{Signal: "SIGINT"}) //nolint:errcheck
chunk = after
continue
}
if action != "" {
handlePTYShortcut(ctx, client, sandboxID, processID, action, nextCh)
detach()
return
}
handlePTYShortcut(ctx, client, sandboxID, processID, action, nextCh)
detach()
return
}
continue
}
encoded := base64.StdEncoding.EncodeToString(chunk)
_, _ = client.WriteProcessInput(ctx, sandboxID, processID, api.ProcessInputRequest{DataBase64: encoded}) //nolint:errcheck
writeProcessInputBytes(ctx, client, sandboxID, processID, chunk)
}
if err != nil {
if !pty && errors.Is(err, io.EOF) {
Expand All @@ -1093,18 +1104,28 @@ func copyProcessInput(ctx context.Context, detach context.CancelFunc, nextCh cha
}
}

func splitOnPTYShortcut(data []byte) (before []byte, action string, found bool) {
func writeProcessInputBytes(ctx context.Context, client *api.SandboxClient, sandboxID, processID string, data []byte) {
if len(data) == 0 {
return
}
encoded := base64.StdEncoding.EncodeToString(data)
_, _ = client.WriteProcessInput(ctx, sandboxID, processID, api.ProcessInputRequest{DataBase64: encoded}) //nolint:errcheck
}

func splitOnPTYControl(data []byte) (before []byte, action string, after []byte, found bool) {
for i, b := range data {
switch b {
case 0x03: // Ctrl-C
return data[:i], "interrupt", data[i+1:], true
case 0x1d: // Ctrl-]
return data[:i], "detach", true
return data[:i], "detach", nil, true
case 0x0e: // Ctrl-N
return data[:i], "new", true
return data[:i], "new", nil, true
case 0x10: // Ctrl-P
return data[:i], "pick", true
return data[:i], "pick", nil, true
}
}
return data, "", false
return data, "", nil, false
}

func handlePTYShortcut(ctx context.Context, client *api.SandboxClient, sandboxID, processID, action string, nextCh chan<- string) {
Expand Down
38 changes: 38 additions & 0 deletions cmd/sandbox/process_flags_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,41 @@ func TestRawProcessFlagValuesEmptyWhenAbsent(t *testing.T) {
t.Fatalf("env = %v, want empty", got)
}
}

func TestSplitOnPTYControlInterrupt(t *testing.T) {
before, action, after, found := splitOnPTYControl([]byte("abc\x03def"))
if !found {
t.Fatal("expected Ctrl-C control byte")
}
if string(before) != "abc" || action != "interrupt" || string(after) != "def" {
t.Fatalf("before/action/after = %q/%q/%q, want abc/interrupt/def", before, action, after)
}
}

func TestSplitOnPTYControlUsesFirstControlByte(t *testing.T) {
before, action, after, found := splitOnPTYControl([]byte("abc\x03\x1d"))
if !found {
t.Fatal("expected control byte")
}
if string(before) != "abc" || action != "interrupt" || string(after) != "\x1d" {
t.Fatalf("before/action/after = %q/%q/%q, want abc/interrupt/Ctrl-]", before, action, after)
}

before, action, after, found = splitOnPTYControl([]byte("abc\x1d\x03"))
if !found {
t.Fatal("expected control byte")
}
if string(before) != "abc" || action != "detach" || after != nil {
t.Fatalf("before/action/after = %q/%q/%q, want abc/detach/nil", before, action, after)
}
}

func TestSplitOnPTYControlNoControlByte(t *testing.T) {
before, action, after, found := splitOnPTYControl([]byte("abc"))
if found {
t.Fatal("did not expect control byte")
}
if string(before) != "abc" || action != "" || after != nil {
t.Fatalf("before/action/after = %q/%q/%q, want abc/empty/nil", before, action, after)
}
}