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

require version tag in CHLOs

Browse Source 
ref #360
This commit is contained in:
Marten Seemann
2016-12-02 16:48:44 +07:00
committed by Lucas Clemente
parent 0fc42896e0
commit f72154e30b
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
handshake/crypto_setup.go
View File

@@ -102,6 +102,11 @@ func (h *CryptoSetup) handleMessage(chloData []byte, cryptoData map[Tag][]byte)
return false, qerr.Error(qerr.CryptoMessageParameterNotFound, "SNI required") return false, qerr.Error(qerr.CryptoMessageParameterNotFound, "SNI required")
} }
_, ok = cryptoData[TagVER]
if !ok {
return false, qerr.Error(qerr.InvalidCryptoMessageParameter, "client hello missing version tag")
}
var reply []byte var reply []byte
var err error var err error
if !h.isInchoateCHLO(cryptoData) { if !h.isInchoateCHLO(cryptoData) {

25
handshake/crypto_setup_test.go
View File

@@ -2,6 +2,7 @@ package handshake
import ( import (
"bytes" "bytes"
"encoding/binary"
"errors" "errors"
"net" "net"
@@ -141,6 +142,7 @@ var _ = Describe("Crypto setup", func() {
cpm ConnectionParametersManager cpm ConnectionParametersManager
aeadChanged chan struct{} aeadChanged chan struct{}
nonce32 []byte nonce32 []byte
versionTag []byte
ip net.IP ip net.IP
validSTK []byte validSTK []byte
aead []byte aead []byte
@@ -163,6 +165,8 @@ var _ = Describe("Crypto setup", func() {
aead = []byte("AESG") aead = []byte("AESG")
kexs = []byte("C255") kexs = []byte("C255")
copy(nonce32[4:12], scfg.obit) // set the OBIT value at the right position copy(nonce32[4:12], scfg.obit) // set the OBIT value at the right position
versionTag = make([]byte, 4)
binary.LittleEndian.PutUint32(versionTag, protocol.VersionNumberToTag(protocol.VersionWhatever))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
scfg.stkSource = &mockStkSource{} scfg.stkSource = &mockStkSource{}
v := protocol.SupportedVersions[len(protocol.SupportedVersions)-1] v := protocol.SupportedVersions[len(protocol.SupportedVersions)-1]
@@ -254,6 +258,7 @@ var _ = Describe("Crypto setup", func() {
TagSNI: []byte("quic.clemente.io"), TagSNI: []byte("quic.clemente.io"),
TagSTK: validSTK, TagSTK: validSTK,
TagPAD: bytes.Repeat([]byte{'a'}, protocol.ClientHelloMinimumSize), TagPAD: bytes.Repeat([]byte{'a'}, protocol.ClientHelloMinimumSize),
TagVER: versionTag,
}) })
WriteHandshakeMessage(&stream.dataToRead, TagCHLO, map[Tag][]byte{ WriteHandshakeMessage(&stream.dataToRead, TagCHLO, map[Tag][]byte{
TagSCID: scfg.ID, TagSCID: scfg.ID,
@@ -263,6 +268,7 @@ var _ = Describe("Crypto setup", func() {
TagAEAD: aead, TagAEAD: aead,
TagKEXS: kexs, TagKEXS: kexs,
TagPUBS: nil, TagPUBS: nil,
TagVER: versionTag,
}) })
err := cs.HandleCryptoStream() err := cs.HandleCryptoStream()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@@ -278,6 +284,7 @@ var _ = Describe("Crypto setup", func() {
TagNONC: []byte("too short client nonce"), TagNONC: []byte("too short client nonce"),
TagSTK: validSTK, TagSTK: validSTK,
TagPUBS: nil, TagPUBS: nil,
TagVER: versionTag,
}) })
err := cs.HandleCryptoStream() err := cs.HandleCryptoStream()
Expect(err).To(MatchError(qerr.Error(qerr.InvalidCryptoMessageParameter, "invalid client nonce length"))) Expect(err).To(MatchError(qerr.Error(qerr.InvalidCryptoMessageParameter, "invalid client nonce length")))
@@ -291,6 +298,7 @@ var _ = Describe("Crypto setup", func() {
TagNONC: nonce, TagNONC: nonce,
TagSTK: validSTK, TagSTK: validSTK,
TagPUBS: nil, TagPUBS: nil,
TagVER: versionTag,
}) })
err := cs.HandleCryptoStream() err := cs.HandleCryptoStream()
Expect(err).To(MatchError(qerr.Error(qerr.InvalidCryptoMessageParameter, "OBIT not matching"))) Expect(err).To(MatchError(qerr.Error(qerr.InvalidCryptoMessageParameter, "OBIT not matching")))
@@ -305,6 +313,7 @@ var _ = Describe("Crypto setup", func() {
TagAEAD: aead, TagAEAD: aead,
TagKEXS: kexs, TagKEXS: kexs,
TagPUBS: nil, TagPUBS: nil,
TagVER: versionTag,
}) })
err := cs.HandleCryptoStream() err := cs.HandleCryptoStream()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@@ -341,6 +350,15 @@ var _ = Describe("Crypto setup", func() {
Expect(err).To(MatchError("CryptoInvalidValueLength: CHLO too small")) Expect(err).To(MatchError("CryptoInvalidValueLength: CHLO too small"))
}) })
It("rejects CHLOs without the version tag", func() {
WriteHandshakeMessage(&stream.dataToRead, TagCHLO, map[Tag][]byte{
TagSCID: scfg.ID,
TagSNI: []byte("quic.clemente.io"),
})
err := cs.HandleCryptoStream()
Expect(err).To(MatchError(qerr.Error(qerr.InvalidCryptoMessageParameter, "client hello missing version tag")))
})
It("errors if the AEAD tag is missing", func() { It("errors if the AEAD tag is missing", func() {
WriteHandshakeMessage(&stream.dataToRead, TagCHLO, map[Tag][]byte{ WriteHandshakeMessage(&stream.dataToRead, TagCHLO, map[Tag][]byte{
TagSCID: scfg.ID, TagSCID: scfg.ID,
@@ -349,6 +367,7 @@ var _ = Describe("Crypto setup", func() {
TagNONC: nonce32, TagNONC: nonce32,
TagSTK: validSTK, TagSTK: validSTK,
TagKEXS: kexs, TagKEXS: kexs,
TagVER: versionTag,
}) })
err := cs.HandleCryptoStream() err := cs.HandleCryptoStream()
Expect(err).To(MatchError(qerr.Error(qerr.CryptoNoSupport, "Unsupported AEAD or KEXS"))) Expect(err).To(MatchError(qerr.Error(qerr.CryptoNoSupport, "Unsupported AEAD or KEXS")))
@@ -363,6 +382,7 @@ var _ = Describe("Crypto setup", func() {
TagSTK: validSTK, TagSTK: validSTK,
TagAEAD: []byte("wrong"), TagAEAD: []byte("wrong"),
TagKEXS: kexs, TagKEXS: kexs,
TagVER: versionTag,
}) })
err := cs.HandleCryptoStream() err := cs.HandleCryptoStream()
Expect(err).To(MatchError(qerr.Error(qerr.CryptoNoSupport, "Unsupported AEAD or KEXS"))) Expect(err).To(MatchError(qerr.Error(qerr.CryptoNoSupport, "Unsupported AEAD or KEXS")))
@@ -376,6 +396,7 @@ var _ = Describe("Crypto setup", func() {
TagNONC: nonce32, TagNONC: nonce32,
TagSTK: validSTK, TagSTK: validSTK,
TagAEAD: aead, TagAEAD: aead,
TagVER: versionTag,
}) })
err := cs.HandleCryptoStream() err := cs.HandleCryptoStream()
Expect(err).To(MatchError(qerr.Error(qerr.CryptoNoSupport, "Unsupported AEAD or KEXS"))) Expect(err).To(MatchError(qerr.Error(qerr.CryptoNoSupport, "Unsupported AEAD or KEXS")))
@@ -390,6 +411,7 @@ var _ = Describe("Crypto setup", func() {
TagSTK: validSTK, TagSTK: validSTK,
TagAEAD: aead, TagAEAD: aead,
TagKEXS: []byte("wrong"), TagKEXS: []byte("wrong"),
TagVER: versionTag,
}) })
err := cs.HandleCryptoStream() err := cs.HandleCryptoStream()
Expect(err).To(MatchError(qerr.Error(qerr.CryptoNoSupport, "Unsupported AEAD or KEXS"))) Expect(err).To(MatchError(qerr.Error(qerr.CryptoNoSupport, "Unsupported AEAD or KEXS")))
@@ -518,6 +540,7 @@ var _ = Describe("Crypto setup", func() {
It("requires STK", func() { It("requires STK", func() {
done, err := cs.handleMessage(bytes.Repeat([]byte{'a'}, protocol.ClientHelloMinimumSize), map[Tag][]byte{ done, err := cs.handleMessage(bytes.Repeat([]byte{'a'}, protocol.ClientHelloMinimumSize), map[Tag][]byte{
TagSNI: []byte("foo"), TagSNI: []byte("foo"),
TagVER: versionTag,
}) })
Expect(done).To(BeFalse()) Expect(done).To(BeFalse())
Expect(err).To(BeNil()) Expect(err).To(BeNil())
@@ -528,6 +551,7 @@ var _ = Describe("Crypto setup", func() {
done, err := cs.handleMessage(bytes.Repeat([]byte{'a'}, protocol.ClientHelloMinimumSize), map[Tag][]byte{ done, err := cs.handleMessage(bytes.Repeat([]byte{'a'}, protocol.ClientHelloMinimumSize), map[Tag][]byte{
TagSTK: validSTK, TagSTK: validSTK,
TagSNI: []byte("foo"), TagSNI: []byte("foo"),
TagVER: versionTag,
}) })
Expect(done).To(BeFalse()) Expect(done).To(BeFalse())
Expect(err).To(BeNil()) Expect(err).To(BeNil())
@@ -537,6 +561,7 @@ var _ = Describe("Crypto setup", func() {
done, err := cs.handleMessage(bytes.Repeat([]byte{'a'}, protocol.ClientHelloMinimumSize), map[Tag][]byte{ done, err := cs.handleMessage(bytes.Repeat([]byte{'a'}, protocol.ClientHelloMinimumSize), map[Tag][]byte{
TagSNI: []byte("foo"), TagSNI: []byte("foo"),
TagSTK: []byte("token \x04\x03\x03\x01"), TagSTK: []byte("token \x04\x03\x03\x01"),
TagVER: versionTag,
}) })
Expect(done).To(BeFalse()) Expect(done).To(BeFalse())
Expect(err).To(BeNil()) Expect(err).To(BeNil())