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

reject packets with version 0 sent by the client

Browse Source 
Version 0 is an invalid version. For packets sent by the server, it is
used to identify the Version Negotiation Packet.
This commit is contained in:
Marten Seemann
2017-12-08 08:51:56 +07:00
parent 2b5573fe82
commit 62b0d99dcd
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/wire/ietf_header.go
View File

@@ -42,6 +42,9 @@ func parseLongHeader(b *bytes.Reader, sentBy protocol.Perspective, typeByte byte
Version: protocol.VersionNumber(v), Version: protocol.VersionNumber(v),
} }
if v == 0 { // version negotiation packet if v == 0 { // version negotiation packet
if sentBy == protocol.PerspectiveClient {
return nil, qerr.InvalidVersion
}
if b.Len() == 0 { if b.Len() == 0 {
return nil, qerr.Error(qerr.InvalidVersionNegotiationPacket, "empty version list") return nil, qerr.Error(qerr.InvalidVersionNegotiationPacket, "empty version list")
} }

11
internal/wire/ietf_header_test.go
View File

@@ -93,6 +93,17 @@ var _ = Describe("IETF draft Header", func() {
Expect(err).To(MatchError("InvalidPacketHeader: Received packet with invalid packet type: 42")) Expect(err).To(MatchError("InvalidPacketHeader: Received packet with invalid packet type: 42"))
}) })
It("rejects version 0 for packets sent by the client", func() {
data := []byte{
0x80 ^ uint8(protocol.PacketTypeInitial),
0xde, 0xad, 0xbe, 0xef, 0xca, 0xfe, 0x13, 0x37, // connection ID
0x0, 0x0, 0x0, 0x0, // version number
0xde, 0xca, 0xfb, 0xad, // packet number
}
_, err := parseHeader(bytes.NewReader(data), protocol.PerspectiveClient)
Expect(err).To(MatchError(qerr.InvalidVersion))
})
It("errors on EOF", func() { It("errors on EOF", func() {
data := generatePacket(protocol.PacketTypeInitial) data := generatePacket(protocol.PacketTypeInitial)
for i := 0; i < len(data); i++ { for i := 0; i < len(data); i++ {