NotificationsYou must be signed in to change notification settings
Fork1.1k
Star11.6k

Commit894b298

committed

fix: stop reading closed channel for/watch devcontainers endpoint

Fixes#19372We increase the read limit to 4MiB (we use this limit elsewhere). Wealso make sure to stop sending messages of `containersCh` becomesclosed.

1 parenta9f607a commit894b298Copy full SHA for 894b298

File tree

2 files changed

-2

lines changed

coderd
- workspaceagents.go
codersdk/workspacesdk
- agentconn.go

2 files changed

-2

lines changed

`‎coderd/workspaceagents.go‎`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -896,7 +896,11 @@ func (api API) watchWorkspaceAgentContainers(rw http.ResponseWriter, r http.Re`
`896`	`896`	`case<-ctx.Done():`
`897`	`897`	`return`
`898`	`898`
`899`		`-casecontainers:=<-containersCh:`
	`899`	`+casecontainers,ok:=<-containersCh:`
	`900`	`+if!ok {`
	`901`	`+return`
	`902`	`+}`
	`903`	`+`
`900`	`904`	`iferr:=encoder.Encode(containers);err!=nil {`
`901`	`905`	`api.Logger.Error(ctx,"encode containers",slog.Error(err))`
`902`	`906`	`return`

`‎codersdk/workspacesdk/agentconn.go‎`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,8 @@ func (c *AgentConn) WatchContainers(ctx context.Context, logger slog.Logger) (<-`
`399`	`399`	`url:=fmt.Sprintf("http://%s%s",host,"/api/v0/containers/watch")`
`400`	`400`
`401`	`401`	`conn,res,err:=websocket.Dial(ctx,url,&websocket.DialOptions{`
`402`		`-HTTPClient:c.apiClient(),`
	`402`	`+HTTPClient:c.apiClient(),`
	`403`	`+CompressionMode:websocket.CompressionContextTakeover,`
`403`	`404`	`})`
`404`	`405`	`iferr!=nil {`
`405`	`406`	`ifres==nil {`
`@@ -411,6 +412,8 @@ func (c *AgentConn) WatchContainers(ctx context.Context, logger slog.Logger) (<-`
`411`	`412`	`deferres.Body.Close()`
`412`	`413`	`}`
`413`	`414`
	`415`	`+conn.SetReadLimit(1<<22)// 4MiB`
	`416`	`+`
`414`	`417`	`d:=wsjson.NewDecoder[codersdk.WorkspaceAgentListContainersResponse](conn,websocket.MessageText,logger)`
`415`	`418`	`returnd.Chan(),d,nil`
`416`	`419`	`}`

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!

Commit894b298

File tree

2 files changed

2 files changed

`‎coderd/workspaceagents.go‎`

`‎codersdk/workspacesdk/agentconn.go‎`

0 commit comments