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

fix connection ID length check in the NEW_CONNECTION_ID frame

Browse Source
This commit is contained in:
Marten Seemann
2019-08-17 10:53:32 +07:00
parent 7df59b855f
commit bb4cfe29cb
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/wire/new_connection_id_frame.go
View File

@@ -35,7 +35,7 @@ func parseNewConnectionIDFrame(r *bytes.Reader, _ protocol.VersionNumber) (*NewC
if err != nil { if err != nil {
return nil, err return nil, err
} }
if connIDLen < 4 || connIDLen > 18 { if connIDLen > protocol.MaxConnIDLen {
return nil, fmt.Errorf("invalid connection ID length: %d", connIDLen) return nil, fmt.Errorf("invalid connection ID length: %d", connIDLen)
} }
connID, err := protocol.ReadConnectionID(r, int(connIDLen)) connID, err := protocol.ReadConnectionID(r, int(connIDLen))
@@ -62,7 +62,7 @@ func (f *NewConnectionIDFrame) Write(b *bytes.Buffer, _ protocol.VersionNumber)
utils.WriteVarInt(b, f.SequenceNumber) utils.WriteVarInt(b, f.SequenceNumber)
utils.WriteVarInt(b, f.RetirePriorTo) utils.WriteVarInt(b, f.RetirePriorTo)
connIDLen := f.ConnectionID.Len() connIDLen := f.ConnectionID.Len()
if connIDLen < 4 || connIDLen > 18 { if connIDLen > protocol.MaxConnIDLen {
return fmt.Errorf("invalid connection ID length: %d", connIDLen) return fmt.Errorf("invalid connection ID length: %d", connIDLen)
} }
b.WriteByte(uint8(connIDLen)) b.WriteByte(uint8(connIDLen))

6
internal/wire/new_connection_id_frame_test.go
View File

@@ -32,12 +32,12 @@ var _ = Describe("NEW_CONNECTION_ID frame", func() {
data := []byte{0x18} data := []byte{0x18}
data = append(data, encodeVarInt(0xdeadbeef)...) // sequence number data = append(data, encodeVarInt(0xdeadbeef)...) // sequence number
data = append(data, encodeVarInt(0xcafe)...) // retire prior to data = append(data, encodeVarInt(0xcafe)...) // retire prior to
data = append(data, 3) // connection ID length data = append(data, 21) // connection ID length
data = append(data, []byte{1, 2, 3}...) // connection ID data = append(data, []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21}...) // connection ID
data = append(data, []byte("deadbeefdecafbad")...) // stateless reset token data = append(data, []byte("deadbeefdecafbad")...) // stateless reset token
b := bytes.NewReader(data) b := bytes.NewReader(data)
_, err := parseNewConnectionIDFrame(b, versionIETFFrames) _, err := parseNewConnectionIDFrame(b, versionIETFFrames)
Expect(err).To(MatchError("invalid connection ID length: 3")) Expect(err).To(MatchError("invalid connection ID length: 21"))
}) })
It("errors on EOFs", func() { It("errors on EOFs", func() {