Commit1fa50a9

authored

fix: Race when writing to a closed pipe (#1916)

1 parent1c5d94e commit1fa50a9Copy full SHA for 1fa50a9

File tree

+13

-17

lines changed

+13

-17

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ func Serve(ctx context.Context, server proto.DRPCProvisionerServer, options *Ser`
`31`	`31`	`ifoptions.Listener==nil {`
`32`	`32`	`config:=yamux.DefaultConfig()`
`33`	`33`	`config.LogOutput=io.Discard`
`34`		`-stdio,err:=yamux.Server(readWriteCloser{`
	`34`	`+stdio,err:=yamux.Server(&readWriteCloser{`
`35`	`35`	`ReadCloser:os.Stdin,`
`36`	`36`	`Writer:os.Stdout,`
`37`	`37`	`},config)`
`@@ -54,6 +54,9 @@ func Serve(ctx context.Context, server proto.DRPCProvisionerServer, options *Ser`
`54`	`54`	`// short-lived processes that can be executed concurrently.`
`55`	`55`	`err=srv.Serve(ctx,options.Listener)`
`56`	`56`	`iferr!=nil {`
	`57`	`+iferrors.Is(err,io.EOF) {`
	`58`	`+returnnil`
	`59`	`+}`
`57`	`60`	`iferrors.Is(err,context.Canceled) {`
`58`	`61`	`returnnil`
`59`	`62`	`}`
`@@ -67,3 +70,8 @@ func Serve(ctx context.Context, server proto.DRPCProvisionerServer, options *Ser`
`67`	`70`	`}`
`68`	`71`	`returnnil`
`69`	`72`	`}`
	`73`	`+`
	`74`	`+typereadWriteCloserstruct {`
	`75`	`+io.ReadCloser`
	`76`	`+io.Writer`
	`77`	`+}`

Lines changed: 4 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package provisionersdk`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`	`"io"`
	`6`	`+"net"`
`6`	`7`
`7`	`8`	`"github.com/hashicorp/yamux"`
`8`	`9`	`"storj.io/drpc"`
`@@ -17,22 +18,14 @@ const (`
`17`	`18`
`18`	`19`	`// TransportPipe creates an in-memory pipe for dRPC transport.`
`19`	`20`	`funcTransportPipe() (yamux.Session,yamux.Session) {`
`20`		`-clientReader,clientWriter:=io.Pipe()`
`21`		`-serverReader,serverWriter:=io.Pipe()`
	`21`	`+c1,c2:=net.Pipe()`
`22`	`22`	`yamuxConfig:=yamux.DefaultConfig()`
`23`	`23`	`yamuxConfig.LogOutput=io.Discard`
`24`		`-client,err:=yamux.Client(&readWriteCloser{`
`25`		`-ReadCloser:clientReader,`
`26`		`-Writer:serverWriter,`
`27`		`-},yamuxConfig)`
	`24`	`+client,err:=yamux.Client(c1,yamuxConfig)`
`28`	`25`	`iferr!=nil {`
`29`	`26`	`panic(err)`
`30`	`27`	`}`
`31`		`-`
`32`		`-server,err:=yamux.Server(&readWriteCloser{`
`33`		`-ReadCloser:serverReader,`
`34`		`-Writer:clientWriter,`
`35`		`-},yamuxConfig)`
	`28`	`+server,err:=yamux.Server(c2,yamuxConfig)`
`36`	`29`	`iferr!=nil {`
`37`	`30`	`panic(err)`
`38`	`31`	`}`
`@@ -44,11 +37,6 @@ func Conn(session *yamux.Session) drpc.Conn {`
`44`	`37`	`return&multiplexedDRPC{session}`
`45`	`38`	`}`
`46`	`39`
`47`		`-typereadWriteCloserstruct {`
`48`		`-io.ReadCloser`
`49`		`-io.Writer`
`50`		`-}`
`51`		`-`
`52`	`40`	`// Allows concurrent requests on a single dRPC connection.`
`53`	`41`	`// Required for calling functions concurrently.`
`54`	`42`	`typemultiplexedDRPCstruct {`

Comments

(0)