Commit3604edc

authored

Merge pull request#291 from nhooyr/dos-56b8

Fix DOS attack from malicious pongs

2 parentse4c3b0f +b0d7a27 commit3604edcCopy full SHA for 3604edc

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,5 @@ RUN go get golang.org/x/tools/cmd/stringer`
`10`	`10`	`RUN go get golang.org/x/lint/golint`
`11`	`11`	`RUN go get github.com/agnivade/wasmbrowsertest`
`12`	`12`
`13`		`-RUN npm install -g prettier`
`14`		`-RUN npm install -g netlify-cli`
	`13`	`+RUN npm--unsafe-perm=trueinstall -g prettier`
	`14`	`+RUN npm--unsafe-perm=trueinstall -g netlify-cli`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ func (c *Conn) Ping(ctx context.Context) error {`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`func (c*Conn)ping(ctx context.Context,pstring)error {`
`192`		`-pong:=make(chanstruct{})`
	`192`	`+pong:=make(chanstruct{},1)`
`193`	`193`
`194`	`194`	`c.activePingsMu.Lock()`
`195`	`195`	`c.activePings[p]=pong`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,10 @@ func (c *Conn) handleControl(ctx context.Context, h header) (err error) {`
`271`	`271`	`pong,ok:=c.activePings[string(b)]`
`272`	`272`	`c.activePingsMu.Unlock()`
`273`	`273`	`ifok {`
`274`		`-close(pong)`
	`274`	`+select {`
	`275`	`+casepong<-struct{}{}:`
	`276`	`+default:`
	`277`	`+}`
`275`	`278`	`}`
`276`	`279`	`returnnil`
`277`	`280`	`}`

Comments

(0)