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

fix handling of unknown frames in the stream hijacker

Browse source
This commit is contained in:
Marten Seemann 2022-05-27 17:35:00 +02:00
parent 3088865952
commit 5cb2e8265c
4 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
http3/frames.go
View file

@ -33,11 +33,10 @@ func parseNextFrame(r io.Reader, unknownFrameHandler unknownFrameHandlerFunc) (f
if err != nil { if err != nil {
return nil, err return nil, err
} }
// If the unknownFrameHandler didn't process the frame, it is our responsibility to skip it.
if hijacked { if hijacked {
return nil, errHijacked return nil, errHijacked
} }
continue // If the unknownFrameHandler didn't process the frame, it is our responsibility to skip it.
} }
l, err := quicvarint.Read(qr) l, err := quicvarint.Read(qr)
if err != nil { if err != nil {

5
http3/frames_test.go
View file

@ -206,6 +206,7 @@ var _ = Describe("Frames", func() {
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
quicvarint.Write(buf, 1337) quicvarint.Write(buf, 1337)
customFrameContents := []byte("custom frame") customFrameContents := []byte("custom frame")
quicvarint.Write(buf, uint64(len(customFrameContents)))
buf.Write(customFrameContents) buf.Write(customFrameContents)
(&dataFrame{Length: 6}).Write(buf) (&dataFrame{Length: 6}).Write(buf)
buf.WriteString("foobar") buf.WriteString("foobar")
@ -214,10 +215,6 @@ var _ = Describe("Frames", func() {
frame, err := parseNextFrame(buf, func(ft FrameType) (hijacked bool, err error) { frame, err := parseNextFrame(buf, func(ft FrameType) (hijacked bool, err error) {
Expect(ft).To(BeEquivalentTo(1337)) Expect(ft).To(BeEquivalentTo(1337))
called = true called = true
b := make([]byte, len(customFrameContents))
_, err = io.ReadFull(buf, b)
Expect(err).ToNot(HaveOccurred())
Expect(string(b)).To(Equal(string(customFrameContents)))
return false, nil return false, nil
}) })
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())

2
http3/roundtrip.go
View file

@ -53,7 +53,7 @@ type RoundTripper struct {
// When set, this callback is called for the first unknown frame parsed on a bidirectional stream. // When set, this callback is called for the first unknown frame parsed on a bidirectional stream.
// It is called right after parsing the frame type. // It is called right after parsing the frame type.
// Callers can either process the frame and return control of the stream back to HTTP/3 // Callers can either ignore the frame and return control of the stream back to HTTP/3
// (by returning hijacked false). // (by returning hijacked false).
// Alternatively, callers can take over the QUIC stream (by returning hijacked true). // Alternatively, callers can take over the QUIC stream (by returning hijacked true).
StreamHijacker func(FrameType, quic.Connection, quic.Stream) (hijacked bool, err error) StreamHijacker func(FrameType, quic.Connection, quic.Stream) (hijacked bool, err error)

2
http3/server.go
View file

@ -178,7 +178,7 @@ type Server struct {
// StreamHijacker, when set, is called for the first unknown frame parsed on a bidirectional stream. // StreamHijacker, when set, is called for the first unknown frame parsed on a bidirectional stream.
// It is called right after parsing the frame type. // It is called right after parsing the frame type.
// Callers can either process the frame and return control of the stream back to HTTP/3 // Callers can either ignore the frame and return control of the stream back to HTTP/3
// (by returning hijacked false). // (by returning hijacked false).
// Alternatively, callers can take over the QUIC stream (by returning hijacked true). // Alternatively, callers can take over the QUIC stream (by returning hijacked true).
StreamHijacker func(FrameType, quic.Connection, quic.Stream) (hijacked bool, err error) StreamHijacker func(FrameType, quic.Connection, quic.Stream) (hijacked bool, err error)