Skip to content

Fix remote exec ignoring --detach-keys option #27442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+11 −2
Closed

Fix remote exec ignoring --detach-keys option #27442

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions pkg/bindings/containers/attach.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,15 @@ func ExecStartAndAttach(ctx context.Context, sessionID string, options *ExecStar
isTerm = respStruct.ProcessConfig.Tty
}

// Extract and parse detach keys from the exec session
detachKeysInBytes := []byte{}
if respStruct.DetachKeys != "" {
detachKeysInBytes, err = term.ToBytes(respStruct.DetachKeys)
if err != nil {
return fmt.Errorf("invalid detach keys in exec session: %w", err)
}
}

// If we are in TTY mode, we need to set raw mode for the terminal.
// TODO: Share all of this with Attach() for containers.
needTTY := terminalFile != nil && terminal.IsTerminal(int(terminalFile.Fd())) && isTerm
Expand Down Expand Up @@ -458,7 +467,7 @@ func ExecStartAndAttach(ctx context.Context, sessionID string, options *ExecStar
if options.GetAttachInput() {
go func() {
logrus.Debugf("Copying STDIN to socket")
_, err := detach.Copy(socket, options.InputStream, []byte{})
_, err := detach.Copy(socket, options.InputStream, detachKeysInBytes)
// Ignore "closed network connection" as it occurs when the exec ends, which is expected.
// This avoids noisy logs but does not fix the goroutine leak
// https://github.com/containers/podman/issues/25344
Expand All @@ -479,7 +488,7 @@ func ExecStartAndAttach(ctx context.Context, sessionID string, options *ExecStar
return fmt.Errorf("exec session %s has a terminal and must have STDOUT enabled", sessionID)
}
// If not multiplex'ed, read from server and write to stdout
_, err := detach.Copy(options.GetOutputStream(), socket, []byte{})
_, err := detach.Copy(options.GetOutputStream(), socket, detachKeysInBytes)
if err != nil {
return err
}
Expand Down