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
3 changes: 3 additions & 0 deletions components/supervisor/pkg/supervisor/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ 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 = grantCapSysPtrace(cmd.SysProcAttr.AmbientCaps)

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
12 changes: 12 additions & 0 deletions components/supervisor/pkg/supervisor/supervisor.go
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 = grantCapSysPtrace(termMuxSrv.DefaultAmbientCaps)
}

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 = grantCapSysPtrace(cmd.SysProcAttr.AmbientCaps)

// 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 Expand Up @@ -1978,3 +1984,9 @@ func waitForIde(parent context.Context, ideReady *ideReadyState, desktopIdeReady
}
return true, ""
}

// We grant ptrace for IDE, terminal, ssh and their child process
// It's make IDE attach more easier
func grantCapSysPtrace(caps []uintptr) []uintptr {
return append(caps, unix.CAP_SYS_PTRACE)
}
15 changes: 12 additions & 3 deletions components/supervisor/pkg/terminal/service.go
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