Commit163e483

committed

fix data race caused by webpush-go mutating msg []byte

1 parentd4ca160 commit163e483Copy full SHA for 163e483

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`"errors"`
`8`	`8`	`"io"`
`9`	`9`	`"net/http"`
	`10`	`+"slices"`
`10`	`11`	`"sync"`
`11`	`12`
`12`	`13`	`"github.com/SherClockHolmes/webpush-go"`
`@@ -93,8 +94,8 @@ func (n *Notifier) Dispatch(ctx context.Context, userID uuid.UUID, notification`
`93`	`94`	`subscription:=subscription`
`94`	`95`	`eg.Go(func()error {`
`95`	`96`	`n.log.Debug(ctx,"dispatching via push",slog.F("subscription",subscription.Endpoint))`
`96`		`-`
`97`		`-resp,err:=webpush.SendNotificationWithContext(ctx,notificationJSON,&webpush.Subscription{`
	`97`	`+cpy:=slices.Clone(notificationJSON)// Need to copy as webpush.SendNotificationWithContext modifies the slice.`
	`98`	`+resp,err:=webpush.SendNotificationWithContext(ctx,cpy,&webpush.Subscription{`
`98`	`99`	`Endpoint:subscription.Endpoint,`
`99`	`100`	`Keys: webpush.Keys{`
`100`	`101`	`Auth:subscription.EndpointAuthKey,`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ func TestPush(t *testing.T) {`
`179`	`179`	`},`
`180`	`180`	`}`
`181`	`181`
`182`		`-err=manager.Dispatch(context.Background(),user.ID,notification)`
	`182`	`+err=manager.Dispatch(ctx,user.ID,notification)`
`183`	`183`	`require.NoError(t,err)`
`184`	`184`	`assert.True(t,okEndpointCalled,"The valid endpoint should be called")`
`185`	`185`	`assert.True(t,goneEndpointCalled,"The expired endpoint should be called")`

Comments

(0)