mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 12:47:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2952 from lucas-clemente/reset-h3-uni-stream-when-type-unknown

Browse source 
cancel reading on unidirectional streams when the stream type is unknown
This commit is contained in:
Marten Seemann 2020-12-29 07:42:24 +07:00 • committed by GitHub
commit b47fe87e51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
http3/client.go
View file

@ -160,6 +160,7 @@ func (c *client) handleUnidirectionalStreams() {
c.session.CloseWithError(quic.ErrorCode(errorIDError), "") c.session.CloseWithError(quic.ErrorCode(errorIDError), "")
return return
default: default:
str.CancelRead(quic.ErrorCode(errorStreamCreationError))
return return
} }
f, err := parseNextFrame(str) f, err := parseNextFrame(str)

25
http3/client_test.go
View file

@ -234,22 +234,17 @@ var _ = Describe("Client", func() {
}) })
It("ignores streams other than the control stream", func() { It("ignores streams other than the control stream", func() {
controlBuf := &bytes.Buffer{} buf := &bytes.Buffer{}
utils.WriteVarInt(controlBuf, streamTypeControlStream) utils.WriteVarInt(buf, 1337)
(&settingsFrame{}).Write(controlBuf) str := mockquic.NewMockStream(mockCtrl)
controlStr := mockquic.NewMockStream(mockCtrl) str.EXPECT().Read(gomock.Any()).DoAndReturn(buf.Read).AnyTimes()
controlStr.EXPECT().Read(gomock.Any()).DoAndReturn(controlBuf.Read).AnyTimes() done := make(chan struct{})
str.EXPECT().CancelRead(quic.ErrorCode(errorStreamCreationError)).Do(func(code quic.ErrorCode) {
otherBuf := &bytes.Buffer{} close(done)
utils.WriteVarInt(otherBuf, 1337)
otherStr := mockquic.NewMockStream(mockCtrl)
otherStr.EXPECT().Read(gomock.Any()).DoAndReturn(otherBuf.Read).AnyTimes()
sess.EXPECT().AcceptUniStream(gomock.Any()).DoAndReturn(func(context.Context) (quic.ReceiveStream, error) {
return otherStr, nil
}) })
sess.EXPECT().AcceptUniStream(gomock.Any()).DoAndReturn(func(context.Context) (quic.ReceiveStream, error) { sess.EXPECT().AcceptUniStream(gomock.Any()).DoAndReturn(func(context.Context) (quic.ReceiveStream, error) {
return controlStr, nil return str, nil
}) })
sess.EXPECT().AcceptUniStream(gomock.Any()).DoAndReturn(func(context.Context) (quic.ReceiveStream, error) { sess.EXPECT().AcceptUniStream(gomock.Any()).DoAndReturn(func(context.Context) (quic.ReceiveStream, error) {
<-testDone <-testDone
@ -257,7 +252,7 @@ var _ = Describe("Client", func() {
}) })
_, err := client.RoundTrip(request) _, err := client.RoundTrip(request)
Expect(err).To(MatchError("done")) Expect(err).To(MatchError("done"))
time.Sleep(scaleDuration(20 * time.Millisecond)) // don't EXPECT any calls to sess.CloseWithError Eventually(done).Should(BeClosed())
}) })
It("errors when the first frame on the control stream is not a SETTINGS frame", func() { It("errors when the first frame on the control stream is not a SETTINGS frame", func() {

1
http3/server.go
View file

@ -294,6 +294,7 @@ func (s *Server) handleUnidirectionalStreams(sess quic.EarlySession) {
sess.CloseWithError(quic.ErrorCode(errorStreamCreationError), "") sess.CloseWithError(quic.ErrorCode(errorStreamCreationError), "")
return return
default: default:
str.CancelRead(quic.ErrorCode(errorStreamCreationError))
return return
} }
f, err := parseNextFrame(str) f, err := parseNextFrame(str)

25
http3/server_test.go
View file

@ -209,29 +209,24 @@ var _ = Describe("Server", func() {
}) })
It("ignores streams other than the control stream", func() { It("ignores streams other than the control stream", func() {
controlBuf := &bytes.Buffer{} buf := &bytes.Buffer{}
utils.WriteVarInt(controlBuf, streamTypeControlStream) utils.WriteVarInt(buf, 1337)
(&settingsFrame{}).Write(controlBuf) str := mockquic.NewMockStream(mockCtrl)
controlStr := mockquic.NewMockStream(mockCtrl) str.EXPECT().Read(gomock.Any()).DoAndReturn(buf.Read).AnyTimes()
controlStr.EXPECT().Read(gomock.Any()).DoAndReturn(controlBuf.Read).AnyTimes() done := make(chan struct{})
str.EXPECT().CancelRead(quic.ErrorCode(errorStreamCreationError)).Do(func(code quic.ErrorCode) {
otherBuf := &bytes.Buffer{} close(done)
utils.WriteVarInt(otherBuf, 1337)
otherStr := mockquic.NewMockStream(mockCtrl)
otherStr.EXPECT().Read(gomock.Any()).DoAndReturn(otherBuf.Read).AnyTimes()
sess.EXPECT().AcceptUniStream(gomock.Any()).DoAndReturn(func(context.Context) (quic.ReceiveStream, error) {
return otherStr, nil
}) })
sess.EXPECT().AcceptUniStream(gomock.Any()).DoAndReturn(func(context.Context) (quic.ReceiveStream, error) { sess.EXPECT().AcceptUniStream(gomock.Any()).DoAndReturn(func(context.Context) (quic.ReceiveStream, error) {
return controlStr, nil return str, nil
}) })
sess.EXPECT().AcceptUniStream(gomock.Any()).DoAndReturn(func(context.Context) (quic.ReceiveStream, error) { sess.EXPECT().AcceptUniStream(gomock.Any()).DoAndReturn(func(context.Context) (quic.ReceiveStream, error) {
<-testDone <-testDone
return nil, errors.New("test done") return nil, errors.New("test done")
}) })
s.handleConn(sess) s.handleConn(sess)
time.Sleep(scaleDuration(20 * time.Millisecond)) // don't EXPECT any calls to sess.CloseWithError Eventually(done).Should(BeClosed())
}) })
It("errors when the first frame on the control stream is not a SETTINGS frame", func() { It("errors when the first frame on the control stream is not a SETTINGS frame", func() {