Skip to content

[supervisor] add ptrace cap for all child process #20359

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

Merged
merged 2 commits into from
Nov 12, 2024
Merged

[supervisor] add ptrace cap for all child process #20359

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c26b6b8
[supervisor] add ptrace cap for all child process
iQQBot Nov 12, 2024
7ef5a2c
addressed feedback
iQQBot Nov 12, 2024
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
2 changes: 2 additions & 0 deletions components/supervisor/pkg/supervisor/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"path/filepath"
"strings"

"golang.org/x/sys/unix"
"golang.org/x/xerrors"

"github.com/gitpod-io/gitpod/common-go/log"
Expand Down Expand Up @@ -170,6 +171,7 @@ func (s *sshServer) handleConn(ctx context.Context, conn net.Conn) {
cmd.Env = s.envvars
cmd.ExtraFiles = []*os.File{socketFD}
cmd.Stderr = os.Stderr
cmd.SysProcAttr.AmbientCaps = append(cmd.SysProcAttr.AmbientCaps, unix.CAP_SYS_PTRACE)
if s.cfg.WorkspaceLogRateLimit > 0 {
limit := int64(s.cfg.WorkspaceLogRateLimit)
cmd.Stderr = dropwriter.Writer(cmd.Stderr, dropwriter.NewBucket(limit*1024*3, limit*1024))
Expand Down
6 changes: 6 additions & 0 deletions components/supervisor/pkg/supervisor/supervisor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import (
"github.com/prometheus/common/route"
"github.com/soheilhy/cmux"
"golang.org/x/crypto/ssh"
"golang.org/x/sys/unix"
"golang.org/x/xerrors"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
Expand Down Expand Up @@ -356,6 +357,9 @@ func Run(options ...RunOption) {
Uid: gitpodUID,
Gid: gitpodGID,
}
if !cfg.isHeadless() {
termMuxSrv.DefaultAmbientCaps = append(termMuxSrv.DefaultAmbientCaps, unix.CAP_SYS_PTRACE)
}

taskManager := newTasksManager(cfg, termMuxSrv, cstate, nil, ideReady, desktopIdeReady)

Expand Down Expand Up @@ -1036,6 +1040,8 @@ func prepareIDELaunch(cfg *Config, ideConfig *IDEConfig) *exec.Cmd {
cmd.SysProcAttr.Setpgid = true
cmd.SysProcAttr.Pdeathsig = syscall.SIGKILL

cmd.SysProcAttr.AmbientCaps = append(cmd.SysProcAttr.AmbientCaps, unix.CAP_SYS_PTRACE)

// Here we must resist the temptation to "neaten up" the IDE output for headless builds.
// This would break the JSON parsing of the headless builds.
cmd.Stdout = os.Stdout
Expand Down
15 changes: 12 additions & 3 deletions components/supervisor/pkg/terminal/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@ type MuxTerminalService struct {
// if returns empty string then DefaultWorkdir is used
DefaultWorkdirProvider func() string

DefaultShell string
Env []string
DefaultCreds *syscall.Credential
DefaultShell string
Env []string
DefaultCreds *syscall.Credential
DefaultAmbientCaps []uintptr

api.UnimplementedTerminalServiceServer
}
Expand Down Expand Up @@ -109,6 +110,14 @@ func (srv *MuxTerminalService) OpenWithOptions(ctx context.Context, req *api.Ope
Y: uint16(req.Size.HeightPx),
}
}

if srv.DefaultAmbientCaps != nil {
if cmd.SysProcAttr == nil {
cmd.SysProcAttr = &syscall.SysProcAttr{}
}
cmd.SysProcAttr.AmbientCaps = srv.DefaultAmbientCaps
}

alias, err := srv.Mux.Start(cmd, options)
if err != nil {
return nil, status.Error(codes.Internal, err.Error())
Expand Down
Loading