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

return an error when parsing a too long connection ID from a header

Browse Source
This commit is contained in:
Marten Seemann
2022-08-29 13:05:24 +03:00
parent 3f1adfd822
commit f41772c43c
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/wire/header.go
View File

@@ -29,6 +29,9 @@ func ParseConnectionID(data []byte, shortHeaderConnIDLen int) (protocol.Connecti
return protocol.ConnectionID{}, io.EOF return protocol.ConnectionID{}, io.EOF
} }
destConnIDLen := int(data[5]) destConnIDLen := int(data[5])
if destConnIDLen > protocol.MaxConnIDLen {
return protocol.ConnectionID{}, protocol.ErrInvalidConnectionIDLen
}
if len(data) < 6+destConnIDLen { if len(data) < 6+destConnIDLen {
return protocol.ConnectionID{}, io.EOF return protocol.ConnectionID{}, io.EOF
} }

9
internal/wire/header_test.go
View File

@@ -86,6 +86,15 @@ var _ = Describe("Header Parsing", func() {
Expect(err).To(MatchError(io.EOF)) Expect(err).To(MatchError(io.EOF))
} }
}) })
It("errors when encountering a too long connection ID", func() {
b := []byte{0x80, 0, 0, 0, 0}
binary.BigEndian.PutUint32(b[1:], uint32(protocol.Version1))
b = append(b, 21) // dest conn id len
b = append(b, make([]byte, 21)...)
_, err := ParseConnectionID(b, 4)
Expect(err).To(MatchError(protocol.ErrInvalidConnectionIDLen))
})
}) })
Context("identifying 0-RTT packets", func() { Context("identifying 0-RTT packets", func() {