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

http3: fix capsule parsing (#4683)

Browse Source 
The current code returns an io.ErrUnexpectedEOF on partial reads of the
capsule content.
This commit is contained in:
Marten Seemann
2024-10-02 09:12:27 -05:00
committed by GitHub
parent e38d38d5d8
commit b2233591ad
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
http3/capsule.go
View File

@@ -10,12 +10,12 @@ import (
type CapsuleType uint64 type CapsuleType uint64
type exactReader struct { type exactReader struct {
R *io.LimitedReader R io.LimitedReader
} }
func (r *exactReader) Read(b []byte) (int, error) { func (r *exactReader) Read(b []byte) (int, error) {
n, err := r.R.Read(b) n, err := r.R.Read(b)
if r.R.N > 0 { if err == io.EOF && r.R.N > 0 {
return n, io.ErrUnexpectedEOF return n, io.ErrUnexpectedEOF
} }
return n, err return n, err
@@ -35,7 +35,7 @@ func (r *countingByteReader) ReadByte() (byte, error) {
} }
// ParseCapsule parses the header of a Capsule. // ParseCapsule parses the header of a Capsule.
// It returns an io.LimitedReader that can be used to read the Capsule value. // It returns an io.Reader that can be used to read the Capsule value.
// The Capsule value must be read entirely (i.e. until the io.EOF) before using r again. // The Capsule value must be read entirely (i.e. until the io.EOF) before using r again.
func ParseCapsule(r quicvarint.Reader) (CapsuleType, io.Reader, error) { func ParseCapsule(r quicvarint.Reader) (CapsuleType, io.Reader, error) {
cbr := countingByteReader{ByteReader: r} cbr := countingByteReader{ByteReader: r}
@@ -55,7 +55,7 @@ func ParseCapsule(r quicvarint.Reader) (CapsuleType, io.Reader, error) {
} }
return 0, nil, err return 0, nil, err
} }
return CapsuleType(ct), &exactReader{R: io.LimitReader(r, int64(l)).(*io.LimitedReader)}, nil return CapsuleType(ct), &exactReader{R: io.LimitedReader{R: r, N: int64(l)}}, nil
} }
// WriteCapsule writes a capsule // WriteCapsule writes a capsule

9
http3/capsule_test.go
View File

@@ -19,9 +19,14 @@ var _ = Describe("Capsule", func() {
ct, r, err := ParseCapsule(bytes.NewReader(b)) ct, r, err := ParseCapsule(bytes.NewReader(b))
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(ct).To(BeEquivalentTo(1337)) Expect(ct).To(BeEquivalentTo(1337))
val, err := io.ReadAll(r) buf := make([]byte, 3)
n, err := r.Read(buf)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(string(val)).To(Equal("foobar")) Expect(n).To(Equal(3))
Expect(buf).To(Equal([]byte("foo")))
data, err := io.ReadAll(r)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal([]byte("bar")))
}) })
It("writes capsules", func() { It("writes capsules", func() {