NotificationsYou must be signed in to change notification settings
Fork926
Star10.1k

Commit66cf59b

authored

fix: Apply environment variables to startup script (#2099)

This was stopping `coder` from being in the path, and allowedapplications started in the script to bypass injected environmnetvariables like `GIT_SSH_COMMAND`.

1 parent1a39931 commit66cf59bCopy full SHA for 66cf59b

File tree

1 file changed

-16

lines changed

agent
- agent.go

1 file changed

-16

lines changed

`‎agent/agent.go`

Lines changed: 4 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -155,20 +155,10 @@ func (a *agent) run(ctx context.Context) {`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`
`158`		`-func (*agent)runStartupScript(ctx context.Context,scriptstring)error {`
	`158`	`+func (a*agent)runStartupScript(ctx context.Context,scriptstring)error {`
`159`	`159`	`ifscript=="" {`
`160`	`160`	`returnnil`
`161`	`161`	`}`
`162`		`-currentUser,err:=user.Current()`
`163`		`-iferr!=nil {`
`164`		`-returnxerrors.Errorf("get current user: %w",err)`
`165`		`-}`
`166`		`-username:=currentUser.Username`
`167`		`-`
`168`		`-shell,err:=usershell.Get(username)`
`169`		`-iferr!=nil {`
`170`		`-returnxerrors.Errorf("get user shell: %w",err)`
`171`		`-}`
`172`	`162`
`173`	`163`	`writer,err:=os.OpenFile(filepath.Join(os.TempDir(),"coder-startup-script.log"),os.O_CREATE\|os.O_RDWR,0600)`
`174`	`164`	`iferr!=nil {`
`@@ -178,12 +168,10 @@ func (*agent) runStartupScript(ctx context.Context, script string) error {`
`178`	`168`	`_=writer.Close()`
`179`	`169`	`}()`
`180`	`170`
`181`		`-caller:="-c"`
`182`		`-ifruntime.GOOS=="windows" {`
`183`		`-caller="/c"`
	`171`	`+cmd,err:=a.createCommand(ctx,script,nil)`
	`172`	`+iferr!=nil {`
	`173`	`+returnxerrors.Errorf("create command: %w",err)`
`184`	`174`	`}`
`185`		`-`
`186`		`-cmd:=exec.CommandContext(ctx,shell,caller,script)`
`187`	`175`	`cmd.Stdout=writer`
`188`	`176`	`cmd.Stderr=writer`
`189`	`177`	`err=cmd.Run()`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit66cf59b

File tree

1 file changed

1 file changed

`‎agent/agent.go`

0 commit comments