gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

wire: correctly parse multi-byte frame types (#3736)

Browse Source
This commit is contained in:
Marten Seemann
2023-04-19 14:42:23 +02:00
committed by GitHub
parent 3f06880917
commit da26f91905
42 changed files with 262 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
internal/wire/streams_blocked_frame_test.go
View File

@@ -15,10 +15,9 @@ import (
var _ = Describe("STREAMS_BLOCKED frame", func() {
Context("parsing", func() {
It("accepts a frame for bidirectional streams", func() {
expected := []byte{0x16}
expected = append(expected, encodeVarInt(0x1337)...)
expected := encodeVarInt(0x1337)
b := bytes.NewReader(expected)
f, err := parseStreamsBlockedFrame(b, protocol.VersionWhatever)
f, err := parseStreamsBlockedFrame(b, 0x16, protocol.VersionWhatever)
Expect(err).ToNot(HaveOccurred())
Expect(f.Type).To(Equal(protocol.StreamTypeBidi))
Expect(f.StreamLimit).To(BeEquivalentTo(0x1337))
@@ -26,10 +25,9 @@ var _ = Describe("STREAMS_BLOCKED frame", func() {
})
It("accepts a frame for unidirectional streams", func() {
expected := []byte{0x17}
expected = append(expected, encodeVarInt(0x7331)...)
expected := encodeVarInt(0x7331)
b := bytes.NewReader(expected)
f, err := parseStreamsBlockedFrame(b, protocol.VersionWhatever)
f, err := parseStreamsBlockedFrame(b, 0x17, protocol.VersionWhatever)
Expect(err).ToNot(HaveOccurred())
Expect(f.Type).To(Equal(protocol.StreamTypeUni))
Expect(f.StreamLimit).To(BeEquivalentTo(0x7331))
@@ -37,12 +35,12 @@ var _ = Describe("STREAMS_BLOCKED frame", func() {
})
It("errors on EOFs", func() {
data := []byte{0x16}
data = append(data, encodeVarInt(0x12345678)...)
_, err := parseStreamsBlockedFrame(bytes.NewReader(data), protocol.Version1)
data := encodeVarInt(0x12345678)
b := bytes.NewReader(data)
_, err := parseStreamsBlockedFrame(b, 0x16, protocol.Version1)
Expect(err).ToNot(HaveOccurred())
for i := range data {
_, err := parseStreamsBlockedFrame(bytes.NewReader(data[:i]), protocol.Version1)
_, err := parseStreamsBlockedFrame(bytes.NewReader(data[:i]), 0x16, protocol.Version1)
Expect(err).To(MatchError(io.EOF))
}
})
@@ -57,7 +55,10 @@ var _ = Describe("STREAMS_BLOCKED frame", func() {
}
b, err := f.Append(nil, protocol.VersionWhatever)
Expect(err).ToNot(HaveOccurred())
frame, err := parseStreamsBlockedFrame(bytes.NewReader(b), protocol.VersionWhatever)
r := bytes.NewReader(b)
typ, err := quicvarint.Read(r)
Expect(err).ToNot(HaveOccurred())
frame, err := parseStreamsBlockedFrame(r, typ, protocol.VersionWhatever)
Expect(err).ToNot(HaveOccurred())
Expect(frame).To(Equal(f))
})
@@ -69,7 +70,10 @@ var _ = Describe("STREAMS_BLOCKED frame", func() {
}
b, err := f.Append(nil, protocol.VersionWhatever)
Expect(err).ToNot(HaveOccurred())
_, err = parseStreamsBlockedFrame(bytes.NewReader(b), protocol.VersionWhatever)
r := bytes.NewReader(b)
typ, err := quicvarint.Read(r)
Expect(err).ToNot(HaveOccurred())
_, err = parseStreamsBlockedFrame(r, typ, protocol.VersionWhatever)
Expect(err).To(MatchError(fmt.Sprintf("%d exceeds the maximum stream count", protocol.MaxStreamCount+1)))
})
}