forked from quic-go/quic-go
split the packet packer into two structs, for gQUIC and for IETF QUIC
This commit is contained in:
Marten Seemann
@@ -24,7 +24,6 @@ var _ = Describe("Packet packer", func() {
|
||||
cryptoStream *MockCryptoStream
|
||||
sealingManager *MockSealingManager
|
||||
sealer *mocks.MockSealer
|
||||
divNonce []byte
|
||||
token []byte
|
||||
)
|
||||
|
||||
@@ -55,7 +54,7 @@ var _ = Describe("Packet packer", func() {
|
||||
|
||||
BeforeEach(func() {
|
||||
rand.Seed(GinkgoRandomSeed())
|
||||
version := versionGQUICFrames
|
||||
version := versionIETFFrames
|
||||
mockSender := NewMockStreamSender(mockCtrl)
|
||||
mockSender.EXPECT().onHasStreamData(gomock.Any()).AnyTimes()
|
||||
cryptoStream = NewMockCryptoStream(mockCtrl)
|
||||
@@ -68,7 +67,6 @@ var _ = Describe("Packet packer", func() {
|
||||
return append(src, bytes.Repeat([]byte{0}, 7)...)
|
||||
}).AnyTimes()
|
||||
|
||||
divNonce = bytes.Repeat([]byte{'e'}, 32)
|
||||
token = []byte("initial token")
|
||||
|
||||
packer = newPacketPacker(
|
||||
@@ -78,7 +76,6 @@ var _ = Describe("Packet packer", func() {
|
||||
func(protocol.PacketNumber) protocol.PacketNumberLen { return protocol.PacketNumberLen2 },
|
||||
&net.TCPAddr{},
|
||||
token, // token
|
||||
divNonce,
|
||||
cryptoStream,
|
||||
sealingManager,
|
||||
framer,
|
||||
@@ -153,168 +150,45 @@ var _ = Describe("Packet packer", func() {
|
||||
})
|
||||
|
||||
Context("generating a packet header", func() {
|
||||
const (
|
||||
versionPublicHeader = protocol.Version39 // a QUIC version that uses the Public Header format
|
||||
versionIETFHeader = protocol.VersionTLS // a QUIC version that uses the IETF Header format
|
||||
)
|
||||
|
||||
Context("Public Header (for gQUIC)", func() {
|
||||
BeforeEach(func() {
|
||||
packer.version = versionPublicHeader
|
||||
})
|
||||
|
||||
It("doesn't set the source connection ID", func() {
|
||||
ph := packer.getHeader(protocol.EncryptionForwardSecure)
|
||||
Expect(ph.SrcConnectionID).To(BeEmpty())
|
||||
})
|
||||
|
||||
It("it omits the connection ID for forward-secure packets", func() {
|
||||
packer.version = protocol.Version43
|
||||
ph := packer.getHeader(protocol.EncryptionForwardSecure)
|
||||
Expect(ph.DestConnectionID.Len()).ToNot(BeZero())
|
||||
packer.HandleTransportParameters(&handshake.TransportParameters{
|
||||
OmitConnectionID: true,
|
||||
})
|
||||
ph = packer.getHeader(protocol.EncryptionForwardSecure)
|
||||
Expect(ph.DestConnectionID.Len()).To(BeZero())
|
||||
})
|
||||
|
||||
It("doesn't omit the connection ID for non-forward-secure packets", func() {
|
||||
packer.HandleTransportParameters(&handshake.TransportParameters{
|
||||
OmitConnectionID: true,
|
||||
})
|
||||
ph := packer.getHeader(protocol.EncryptionSecure)
|
||||
Expect(ph.DestConnectionID.Len()).ToNot(BeZero())
|
||||
})
|
||||
|
||||
It("adds the Version Flag to the Public Header before the crypto handshake is finished", func() {
|
||||
packer.perspective = protocol.PerspectiveClient
|
||||
ph := packer.getHeader(protocol.EncryptionSecure)
|
||||
Expect(ph.VersionFlag).To(BeTrue())
|
||||
})
|
||||
|
||||
It("doesn't add the Version Flag to the Public Header for forward-secure packets", func() {
|
||||
packer.perspective = protocol.PerspectiveClient
|
||||
ph := packer.getHeader(protocol.EncryptionForwardSecure)
|
||||
Expect(ph.VersionFlag).To(BeFalse())
|
||||
})
|
||||
|
||||
Context("diversificaton nonces", func() {
|
||||
It("doesn't include a div nonce, when sending a packet with initial encryption", func() {
|
||||
ph := packer.getHeader(protocol.EncryptionUnencrypted)
|
||||
Expect(ph.DiversificationNonce).To(BeEmpty())
|
||||
})
|
||||
|
||||
It("includes a div nonce, when sending a packet with secure encryption", func() {
|
||||
ph := packer.getHeader(protocol.EncryptionSecure)
|
||||
Expect(ph.DiversificationNonce).To(Equal(divNonce))
|
||||
})
|
||||
|
||||
It("doesn't include a div nonce, when sending a packet with forward-secure encryption", func() {
|
||||
ph := packer.getHeader(protocol.EncryptionForwardSecure)
|
||||
Expect(ph.DiversificationNonce).To(BeEmpty())
|
||||
})
|
||||
|
||||
It("doesn't send a div nonce as a client", func() {
|
||||
packer.perspective = protocol.PerspectiveClient
|
||||
ph := packer.getHeader(protocol.EncryptionSecure)
|
||||
Expect(ph.DiversificationNonce).To(BeEmpty())
|
||||
})
|
||||
})
|
||||
It("uses the Long Header format for non-forward-secure packets", func() {
|
||||
h := packer.getHeader(protocol.EncryptionSecure)
|
||||
Expect(h.IsLongHeader).To(BeTrue())
|
||||
Expect(h.Version).To(Equal(packer.version))
|
||||
})
|
||||
|
||||
Context("Header (for gQUIC 44)", func() {
|
||||
BeforeEach(func() {
|
||||
packer.version = protocol.Version44
|
||||
})
|
||||
|
||||
It("sends an Initial packet as the first packets, for the client", func() {
|
||||
packer.perspective = protocol.PerspectiveClient
|
||||
packer.hasSentPacket = false
|
||||
h := packer.getHeader(protocol.EncryptionUnencrypted)
|
||||
Expect(h.IsLongHeader).To(BeTrue())
|
||||
Expect(h.Type).To(Equal(protocol.PacketTypeInitial))
|
||||
Expect(h.Version).To(Equal(protocol.Version44))
|
||||
Expect(h.DestConnectionID).To(Equal(packer.destConnID))
|
||||
Expect(h.SrcConnectionID).To(Equal(packer.srcConnID))
|
||||
Expect(h.PacketNumberLen).To(Equal(protocol.PacketNumberLen4))
|
||||
})
|
||||
|
||||
It("sends a Handshake for non-forward-secure packets, for the server", func() {
|
||||
packer.perspective = protocol.PerspectiveServer
|
||||
h := packer.getHeader(protocol.EncryptionUnencrypted)
|
||||
Expect(h.IsLongHeader).To(BeTrue())
|
||||
Expect(h.Type).To(Equal(protocol.PacketTypeHandshake))
|
||||
Expect(h.Version).To(Equal(protocol.Version44))
|
||||
Expect(h.DestConnectionID).To(Equal(packer.destConnID))
|
||||
Expect(h.SrcConnectionID).To(Equal(packer.srcConnID))
|
||||
Expect(h.PacketNumberLen).To(Equal(protocol.PacketNumberLen4))
|
||||
})
|
||||
|
||||
It("sets the Diversification Nonce for secure packets", func() {
|
||||
packer.perspective = protocol.PerspectiveServer
|
||||
Expect(divNonce).ToNot(BeEmpty())
|
||||
h := packer.getHeader(protocol.EncryptionSecure)
|
||||
Expect(h.IsLongHeader).To(BeTrue())
|
||||
Expect(h.Version).To(Equal(protocol.Version44))
|
||||
Expect(h.Type).To(Equal(protocol.PacketType0RTT))
|
||||
Expect(h.DiversificationNonce).To(Equal(divNonce))
|
||||
})
|
||||
|
||||
It("uses the Short Header for forward-secure packets", func() {
|
||||
h := packer.getHeader(protocol.EncryptionForwardSecure)
|
||||
Expect(h.IsLongHeader).To(BeFalse())
|
||||
Expect(h.IsPublicHeader).To(BeFalse())
|
||||
Expect(h.DestConnectionID).To(Equal(packer.destConnID))
|
||||
})
|
||||
It("sets source and destination connection ID", func() {
|
||||
srcConnID := protocol.ConnectionID{1, 2, 3, 4, 5, 6, 7, 8}
|
||||
destConnID := protocol.ConnectionID{8, 7, 6, 5, 4, 3, 2, 1}
|
||||
packer.srcConnID = srcConnID
|
||||
packer.destConnID = destConnID
|
||||
h := packer.getHeader(protocol.EncryptionSecure)
|
||||
Expect(h.SrcConnectionID).To(Equal(srcConnID))
|
||||
Expect(h.DestConnectionID).To(Equal(destConnID))
|
||||
})
|
||||
|
||||
Context("Header (for IETF draft QUIC)", func() {
|
||||
BeforeEach(func() {
|
||||
packer.version = versionIETFHeader
|
||||
})
|
||||
It("changes the destination connection ID", func() {
|
||||
srcConnID := protocol.ConnectionID{1, 1, 1, 1, 1, 1, 1, 1}
|
||||
packer.srcConnID = srcConnID
|
||||
dest1 := protocol.ConnectionID{1, 2, 3, 4, 5, 6, 7, 8}
|
||||
dest2 := protocol.ConnectionID{8, 7, 6, 5, 4, 3, 2, 1}
|
||||
packer.ChangeDestConnectionID(dest1)
|
||||
h := packer.getHeader(protocol.EncryptionUnencrypted)
|
||||
Expect(h.SrcConnectionID).To(Equal(srcConnID))
|
||||
Expect(h.DestConnectionID).To(Equal(dest1))
|
||||
packer.ChangeDestConnectionID(dest2)
|
||||
h = packer.getHeader(protocol.EncryptionUnencrypted)
|
||||
Expect(h.SrcConnectionID).To(Equal(srcConnID))
|
||||
Expect(h.DestConnectionID).To(Equal(dest2))
|
||||
})
|
||||
|
||||
It("uses the Long Header format for non-forward-secure packets", func() {
|
||||
h := packer.getHeader(protocol.EncryptionSecure)
|
||||
Expect(h.IsLongHeader).To(BeTrue())
|
||||
Expect(h.Version).To(Equal(versionIETFHeader))
|
||||
})
|
||||
|
||||
It("sets source and destination connection ID", func() {
|
||||
srcConnID := protocol.ConnectionID{1, 2, 3, 4, 5, 6, 7, 8}
|
||||
destConnID := protocol.ConnectionID{8, 7, 6, 5, 4, 3, 2, 1}
|
||||
packer.srcConnID = srcConnID
|
||||
packer.destConnID = destConnID
|
||||
h := packer.getHeader(protocol.EncryptionSecure)
|
||||
Expect(h.SrcConnectionID).To(Equal(srcConnID))
|
||||
Expect(h.DestConnectionID).To(Equal(destConnID))
|
||||
})
|
||||
|
||||
It("changes the destination connection ID", func() {
|
||||
srcConnID := protocol.ConnectionID{1, 1, 1, 1, 1, 1, 1, 1}
|
||||
packer.srcConnID = srcConnID
|
||||
dest1 := protocol.ConnectionID{1, 2, 3, 4, 5, 6, 7, 8}
|
||||
dest2 := protocol.ConnectionID{8, 7, 6, 5, 4, 3, 2, 1}
|
||||
packer.ChangeDestConnectionID(dest1)
|
||||
h := packer.getHeader(protocol.EncryptionUnencrypted)
|
||||
Expect(h.SrcConnectionID).To(Equal(srcConnID))
|
||||
Expect(h.DestConnectionID).To(Equal(dest1))
|
||||
packer.ChangeDestConnectionID(dest2)
|
||||
h = packer.getHeader(protocol.EncryptionUnencrypted)
|
||||
Expect(h.SrcConnectionID).To(Equal(srcConnID))
|
||||
Expect(h.DestConnectionID).To(Equal(dest2))
|
||||
})
|
||||
|
||||
It("uses the Short Header format for forward-secure packets", func() {
|
||||
h := packer.getHeader(protocol.EncryptionForwardSecure)
|
||||
Expect(h.IsLongHeader).To(BeFalse())
|
||||
Expect(h.PacketNumberLen).To(BeNumerically(">", 0))
|
||||
})
|
||||
It("uses the Short Header format for forward-secure packets", func() {
|
||||
h := packer.getHeader(protocol.EncryptionForwardSecure)
|
||||
Expect(h.IsLongHeader).To(BeFalse())
|
||||
Expect(h.PacketNumberLen).To(BeNumerically(">", 0))
|
||||
})
|
||||
})
|
||||
|
||||
It("sets the payload length for packets containing crypto data", func() {
|
||||
packer.version = versionIETFFrames
|
||||
f := &wire.StreamFrame{
|
||||
StreamID: packer.version.CryptoStreamID(),
|
||||
Offset: 0x1337,
|
||||
@@ -383,39 +257,6 @@ var _ = Describe("Packet packer", func() {
|
||||
Expect(p2.header.PacketNumber).To(BeNumerically(">", p1.header.PacketNumber))
|
||||
})
|
||||
|
||||
It("packs ACKs and STOP_WAITING frames first, then control frames, then STREAM frames", func() {
|
||||
cryptoStream.EXPECT().hasData()
|
||||
ack := &wire.AckFrame{AckRanges: []wire.AckRange{{Largest: 100}}}
|
||||
swf := &wire.StopWaitingFrame{LeastUnacked: 10}
|
||||
mdf := &wire.MaxDataFrame{ByteOffset: 0x1234}
|
||||
sf := &wire.StreamFrame{Data: []byte("foobar")}
|
||||
sealingManager.EXPECT().GetSealer().Return(protocol.EncryptionForwardSecure, sealer)
|
||||
ackFramer.EXPECT().GetAckFrame().Return(ack)
|
||||
ackFramer.EXPECT().GetStopWaitingFrame(false).Return(swf)
|
||||
expectAppendControlFrames(mdf)
|
||||
expectAppendStreamFrames(sf)
|
||||
packer.packetNumberGenerator.next = 15
|
||||
p, err := packer.PackPacket()
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(p).ToNot(BeNil())
|
||||
Expect(p.frames).To(Equal([]wire.Frame{ack, swf, mdf, sf}))
|
||||
})
|
||||
|
||||
It("sets the LeastUnackedDelta length of a STOP_WAITING frame", func() {
|
||||
sealingManager.EXPECT().GetSealer().Return(protocol.EncryptionForwardSecure, sealer)
|
||||
cryptoStream.EXPECT().hasData()
|
||||
swf := &wire.StopWaitingFrame{LeastUnacked: 0x1337 - 0x100}
|
||||
ackFramer.EXPECT().GetAckFrame().Return(&wire.AckFrame{AckRanges: []wire.AckRange{{Largest: 100}}})
|
||||
ackFramer.EXPECT().GetStopWaitingFrame(false).Return(swf)
|
||||
expectAppendControlFrames()
|
||||
expectAppendStreamFrames()
|
||||
packer.packetNumberGenerator.next = 0x1337
|
||||
p, err := packer.PackPacket()
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(p.frames).To(HaveLen(2))
|
||||
Expect(p.frames[1].(*wire.StopWaitingFrame).PacketNumberLen).To(Equal(protocol.PacketNumberLen2))
|
||||
})
|
||||
|
||||
It("refuses to send a packet that doesn't contain crypto stream data, if it has never sent a packet before", func() {
|
||||
cryptoStream.EXPECT().hasData()
|
||||
packer.hasSentPacket = false
|
||||
@@ -435,7 +276,7 @@ var _ = Describe("Packet packer", func() {
|
||||
return fs, 444
|
||||
}),
|
||||
framer.EXPECT().AppendStreamFrames(gomock.Any(), gomock.Any()).Do(func(_ []wire.Frame, maxLen protocol.ByteCount) []wire.Frame {
|
||||
Expect(maxLen).To(Equal(maxSize - 444 + 2 /* data length of the STREAM frame */))
|
||||
Expect(maxLen).To(Equal(maxSize - 444 + 1 /* data length of the STREAM frame */))
|
||||
return nil
|
||||
}),
|
||||
)
|
||||
@@ -469,7 +310,6 @@ var _ = Describe("Packet packer", func() {
|
||||
for i := 0; i < protocol.MaxNonRetransmittableAcks; i++ {
|
||||
sealingManager.EXPECT().GetSealer().Return(protocol.EncryptionForwardSecure, sealer)
|
||||
ackFramer.EXPECT().GetAckFrame().Return(&wire.AckFrame{AckRanges: []wire.AckRange{{Smallest: 1, Largest: 1}}})
|
||||
ackFramer.EXPECT().GetStopWaitingFrame(false)
|
||||
expectAppendControlFrames()
|
||||
expectAppendStreamFrames()
|
||||
p, err := packer.PackPacket()
|
||||
@@ -484,7 +324,6 @@ var _ = Describe("Packet packer", func() {
|
||||
sealingManager.EXPECT().GetSealer().Return(protocol.EncryptionForwardSecure, sealer)
|
||||
cryptoStream.EXPECT().hasData()
|
||||
ackFramer.EXPECT().GetAckFrame().Return(&wire.AckFrame{AckRanges: []wire.AckRange{{Smallest: 1, Largest: 1}}})
|
||||
ackFramer.EXPECT().GetStopWaitingFrame(false)
|
||||
expectAppendControlFrames()
|
||||
expectAppendStreamFrames()
|
||||
p, err := packer.PackPacket()
|
||||
@@ -495,7 +334,6 @@ var _ = Describe("Packet packer", func() {
|
||||
sealingManager.EXPECT().GetSealer().Return(protocol.EncryptionForwardSecure, sealer)
|
||||
cryptoStream.EXPECT().hasData()
|
||||
ackFramer.EXPECT().GetAckFrame().Return(&wire.AckFrame{AckRanges: []wire.AckRange{{Smallest: 1, Largest: 1}}})
|
||||
ackFramer.EXPECT().GetStopWaitingFrame(false)
|
||||
expectAppendControlFrames()
|
||||
expectAppendStreamFrames()
|
||||
p, err = packer.PackPacket()
|
||||
@@ -521,7 +359,6 @@ var _ = Describe("Packet packer", func() {
|
||||
cryptoStream.EXPECT().hasData()
|
||||
sealingManager.EXPECT().GetSealer().Return(protocol.EncryptionForwardSecure, sealer)
|
||||
ackFramer.EXPECT().GetAckFrame().Return(&wire.AckFrame{AckRanges: []wire.AckRange{{Smallest: 1, Largest: 1}}})
|
||||
ackFramer.EXPECT().GetStopWaitingFrame(false)
|
||||
p, err = packer.PackPacket()
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(p.frames).To(HaveLen(2))
|
||||
@@ -543,30 +380,7 @@ var _ = Describe("Packet packer", func() {
|
||||
})
|
||||
|
||||
Context("STREAM frame handling", func() {
|
||||
It("does not split a STREAM frame with maximum size, for gQUIC frames", func() {
|
||||
cryptoStream.EXPECT().hasData()
|
||||
sealingManager.EXPECT().GetSealer().Return(protocol.EncryptionForwardSecure, sealer)
|
||||
ackFramer.EXPECT().GetAckFrame()
|
||||
expectAppendControlFrames()
|
||||
sf := &wire.StreamFrame{
|
||||
Offset: 1,
|
||||
StreamID: 5,
|
||||
DataLenPresent: true,
|
||||
}
|
||||
framer.EXPECT().AppendStreamFrames(gomock.Any(), gomock.Any()).DoAndReturn(func(_ []wire.Frame, maxSize protocol.ByteCount) ([]wire.Frame, protocol.ByteCount) {
|
||||
sf.Data = bytes.Repeat([]byte{'f'}, int(maxSize-sf.Length(packer.version)))
|
||||
return []wire.Frame{sf}, sf.Length(packer.version)
|
||||
})
|
||||
p, err := packer.PackPacket()
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(p.frames).To(HaveLen(1))
|
||||
Expect(p.raw).To(HaveLen(int(maxPacketSize)))
|
||||
Expect(p.frames[0].(*wire.StreamFrame).Data).To(HaveLen(len(sf.Data)))
|
||||
Expect(p.frames[0].(*wire.StreamFrame).DataLenPresent).To(BeFalse())
|
||||
})
|
||||
|
||||
It("does not split a STREAM frame with maximum size, for IETF draft style frame", func() {
|
||||
packer.version = versionIETFFrames
|
||||
It("does not split a STREAM frame with maximum size", func() {
|
||||
ackFramer.EXPECT().GetAckFrame()
|
||||
cryptoStream.EXPECT().hasData()
|
||||
sealingManager.EXPECT().GetSealer().Return(protocol.EncryptionForwardSecure, sealer)
|
||||
@@ -715,27 +529,25 @@ var _ = Describe("Packet packer", func() {
|
||||
sealingManager.EXPECT().GetSealer().Return(protocol.EncryptionUnencrypted, sealer)
|
||||
ack := &wire.AckFrame{AckRanges: []wire.AckRange{{Largest: 10, Smallest: 1}}}
|
||||
ackFramer.EXPECT().GetAckFrame().Return(ack)
|
||||
ackFramer.EXPECT().GetStopWaitingFrame(false)
|
||||
expectAppendControlFrames()
|
||||
// don't expect a call to framer.PopStreamFrames
|
||||
p, err := packer.PackPacket()
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(p.frames).To(Equal([]wire.Frame{ack}))
|
||||
})
|
||||
})
|
||||
|
||||
It("packs a single ACK", func() {
|
||||
ack := &wire.AckFrame{AckRanges: []wire.AckRange{{Largest: 42, Smallest: 1}}}
|
||||
sealingManager.EXPECT().GetSealer().Return(protocol.EncryptionForwardSecure, sealer)
|
||||
cryptoStream.EXPECT().hasData()
|
||||
ackFramer.EXPECT().GetAckFrame().Return(ack)
|
||||
ackFramer.EXPECT().GetStopWaitingFrame(false)
|
||||
expectAppendControlFrames()
|
||||
expectAppendStreamFrames()
|
||||
p, err := packer.PackPacket()
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
Expect(p).ToNot(BeNil())
|
||||
Expect(p.frames[0]).To(Equal(ack))
|
||||
})
|
||||
It("packs a single ACK", func() {
|
||||
cryptoStream.EXPECT().hasData()
|
||||
ack := &wire.AckFrame{AckRanges: []wire.AckRange{{Largest: 42, Smallest: 1}}}
|
||||
ackFramer.EXPECT().GetAckFrame().Return(ack)
|
||||
sealingManager.EXPECT().GetSealer().Return(protocol.EncryptionForwardSecure, sealer)
|
||||
expectAppendControlFrames()
|
||||
expectAppendStreamFrames()
|
||||
p, err := packer.PackPacket()
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
Expect(p).ToNot(BeNil())
|
||||
Expect(p.frames[0]).To(Equal(ack))
|
||||
})
|
||||
|
||||
Context("retransmitting of handshake packets", func() {
|
||||
@@ -745,9 +557,7 @@ var _ = Describe("Packet packer", func() {
|
||||
}
|
||||
|
||||
It("packs a retransmission with the right encryption level", func() {
|
||||
swf := &wire.StopWaitingFrame{LeastUnacked: 1}
|
||||
sealingManager.EXPECT().GetSealerWithEncryptionLevel(protocol.EncryptionUnencrypted).Return(sealer, nil)
|
||||
ackFramer.EXPECT().GetStopWaitingFrame(true).Return(swf)
|
||||
packet := &ackhandler.Packet{
|
||||
PacketType: protocol.PacketTypeHandshake,
|
||||
EncryptionLevel: protocol.EncryptionUnencrypted,
|
||||
@@ -757,54 +567,19 @@ var _ = Describe("Packet packer", func() {
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(p).To(HaveLen(1))
|
||||
Expect(p[0].header.Type).To(Equal(protocol.PacketTypeHandshake))
|
||||
Expect(p[0].frames).To(Equal([]wire.Frame{swf, sf}))
|
||||
Expect(p[0].encryptionLevel).To(Equal(protocol.EncryptionUnencrypted))
|
||||
})
|
||||
|
||||
It("doesn't add a STOP_WAITING frame for IETF QUIC", func() {
|
||||
sealingManager.EXPECT().GetSealerWithEncryptionLevel(protocol.EncryptionUnencrypted).Return(sealer, nil)
|
||||
packer.version = versionIETFFrames
|
||||
packet := &ackhandler.Packet{
|
||||
EncryptionLevel: protocol.EncryptionUnencrypted,
|
||||
Frames: []wire.Frame{sf},
|
||||
}
|
||||
p, err := packer.PackRetransmission(packet)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(p).To(HaveLen(1))
|
||||
Expect(p[0].frames).To(Equal([]wire.Frame{sf}))
|
||||
Expect(p[0].encryptionLevel).To(Equal(protocol.EncryptionUnencrypted))
|
||||
})
|
||||
|
||||
It("packs a retransmission for a packet sent with secure encryption", func() {
|
||||
sealingManager.EXPECT().GetSealerWithEncryptionLevel(protocol.EncryptionSecure).Return(sealer, nil)
|
||||
swf := &wire.StopWaitingFrame{LeastUnacked: 1}
|
||||
ackFramer.EXPECT().GetStopWaitingFrame(true).Return(swf)
|
||||
packet := &ackhandler.Packet{
|
||||
EncryptionLevel: protocol.EncryptionSecure,
|
||||
Frames: []wire.Frame{sf},
|
||||
}
|
||||
p, err := packer.PackRetransmission(packet)
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(p).To(HaveLen(1))
|
||||
Expect(p[0].frames).To(Equal([]wire.Frame{swf, sf}))
|
||||
Expect(p[0].encryptionLevel).To(Equal(protocol.EncryptionSecure))
|
||||
// a packet sent by the server with secure encryption contains the SHLO
|
||||
// it needs to have a diversification nonce
|
||||
Expect(p[0].raw).To(ContainSubstring(string(divNonce)))
|
||||
})
|
||||
|
||||
// this should never happen, since non forward-secure packets are limited to a size smaller than MaxPacketSize, such that it is always possible to retransmit them without splitting the StreamFrame
|
||||
// (note that the retransmitted packet needs to have enough space for the StopWaitingFrame)
|
||||
It("refuses to send a packet larger than MaxPacketSize", func() {
|
||||
sealingManager.EXPECT().GetSealerWithEncryptionLevel(gomock.Any()).Return(sealer, nil)
|
||||
swf := &wire.StopWaitingFrame{LeastUnacked: 1}
|
||||
ackFramer.EXPECT().GetStopWaitingFrame(true).Return(swf)
|
||||
packet := &ackhandler.Packet{
|
||||
EncryptionLevel: protocol.EncryptionSecure,
|
||||
Frames: []wire.Frame{
|
||||
&wire.StreamFrame{
|
||||
StreamID: 1,
|
||||
Data: bytes.Repeat([]byte{'f'}, int(maxPacketSize-5)),
|
||||
Data: bytes.Repeat([]byte{'f'}, int(maxPacketSize)),
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -841,7 +616,6 @@ var _ = Describe("Packet packer", func() {
|
||||
StreamID: packer.version.CryptoStreamID(),
|
||||
Data: []byte("foobar"),
|
||||
}, false)
|
||||
packer.version = protocol.VersionTLS
|
||||
packer.hasSentPacket = false
|
||||
packer.perspective = protocol.PerspectiveClient
|
||||
packet, err := packer.PackPacket()
|
||||
@@ -870,9 +644,7 @@ var _ = Describe("Packet packer", func() {
|
||||
|
||||
Context("retransmission of forward-secure packets", func() {
|
||||
It("retransmits a small packet", func() {
|
||||
swf := &wire.StopWaitingFrame{LeastUnacked: 7}
|
||||
packer.packetNumberGenerator.next = 10
|
||||
ackFramer.EXPECT().GetStopWaitingFrame(true).Return(swf)
|
||||
sealingManager.EXPECT().GetSealer().Return(protocol.EncryptionForwardSecure, sealer)
|
||||
frames := []wire.Frame{
|
||||
&wire.MaxDataFrame{ByteOffset: 0x1234},
|
||||
@@ -886,12 +658,7 @@ var _ = Describe("Packet packer", func() {
|
||||
Expect(packets).To(HaveLen(1))
|
||||
p := packets[0]
|
||||
Expect(p.encryptionLevel).To(Equal(protocol.EncryptionForwardSecure))
|
||||
Expect(p.frames).To(HaveLen(3))
|
||||
Expect(p.frames[0]).To(BeAssignableToTypeOf(&wire.StopWaitingFrame{}))
|
||||
Expect(p.frames[0].(*wire.StopWaitingFrame).LeastUnacked).To(Equal(protocol.PacketNumber(7)))
|
||||
Expect(p.frames[0].(*wire.StopWaitingFrame).PacketNumber).To(Equal(p.header.PacketNumber))
|
||||
Expect(p.frames[0].(*wire.StopWaitingFrame).PacketNumberLen).To(Equal(p.header.PacketNumberLen))
|
||||
Expect(p.frames[1:]).To(Equal(frames))
|
||||
Expect(p.frames).To(Equal(frames))
|
||||
})
|
||||
|
||||
It("packs two packets for retransmission if the original packet contained many control frames", func() {
|
||||
@@ -900,32 +667,28 @@ var _ = Describe("Packet packer", func() {
|
||||
var totalLen protocol.ByteCount
|
||||
// pack a bunch of control frames, such that the packet is way bigger than a single packet
|
||||
for i := 0; totalLen < maxPacketSize*3/2; i++ {
|
||||
f := &wire.MaxStreamDataFrame{StreamID: protocol.StreamID(i), ByteOffset: protocol.ByteCount(i)}
|
||||
f := &wire.MaxStreamDataFrame{
|
||||
StreamID: protocol.StreamID(i),
|
||||
ByteOffset: protocol.ByteCount(i),
|
||||
}
|
||||
frames = append(frames, f)
|
||||
totalLen += f.Length(packer.version)
|
||||
}
|
||||
packer.packetNumberGenerator.next = 10
|
||||
swf := &wire.StopWaitingFrame{LeastUnacked: 7}
|
||||
ackFramer.EXPECT().GetStopWaitingFrame(true).Return(swf)
|
||||
packets, err := packer.PackRetransmission(&ackhandler.Packet{
|
||||
EncryptionLevel: protocol.EncryptionForwardSecure,
|
||||
Frames: frames,
|
||||
})
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(packets).To(HaveLen(2))
|
||||
Expect(len(packets[0].frames) + len(packets[1].frames)).To(Equal(len(frames) + 2)) // all frames, plus 2 STOP_WAITING frames
|
||||
Expect(packets[0].frames[0]).To(BeAssignableToTypeOf(&wire.StopWaitingFrame{}))
|
||||
Expect(packets[1].frames[0]).To(BeAssignableToTypeOf(&wire.StopWaitingFrame{}))
|
||||
Expect(packets[0].frames[1:]).To(Equal(frames[:len(packets[0].frames)-1]))
|
||||
Expect(packets[1].frames[1:]).To(Equal(frames[len(packets[0].frames)-1:]))
|
||||
Expect(len(packets[0].frames) + len(packets[1].frames)).To(Equal(len(frames)))
|
||||
Expect(packets[1].frames).To(Equal(frames[len(packets[0].frames):]))
|
||||
// check that the first packet was filled up as far as possible:
|
||||
// if the first frame (after the STOP_WAITING) was packed into the first packet, it would have overflown the MaxPacketSize
|
||||
Expect(len(packets[0].raw) + int(packets[1].frames[1].Length(packer.version))).To(BeNumerically(">", maxPacketSize))
|
||||
})
|
||||
|
||||
It("splits a STREAM frame that doesn't fit", func() {
|
||||
swf := &wire.StopWaitingFrame{}
|
||||
ackFramer.EXPECT().GetStopWaitingFrame(true).Return(swf)
|
||||
sealingManager.EXPECT().GetSealer().Return(protocol.EncryptionForwardSecure, sealer)
|
||||
packets, err := packer.PackRetransmission(&ackhandler.Packet{
|
||||
EncryptionLevel: protocol.EncryptionForwardSecure,
|
||||
@@ -937,12 +700,10 @@ var _ = Describe("Packet packer", func() {
|
||||
})
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(packets).To(HaveLen(2))
|
||||
Expect(packets[0].frames[0]).To(BeAssignableToTypeOf(&wire.StopWaitingFrame{}))
|
||||
Expect(packets[1].frames[0]).To(BeAssignableToTypeOf(&wire.StopWaitingFrame{}))
|
||||
Expect(packets[0].frames[1]).To(BeAssignableToTypeOf(&wire.StreamFrame{}))
|
||||
Expect(packets[1].frames[1]).To(BeAssignableToTypeOf(&wire.StreamFrame{}))
|
||||
sf1 := packets[0].frames[1].(*wire.StreamFrame)
|
||||
sf2 := packets[1].frames[1].(*wire.StreamFrame)
|
||||
Expect(packets[0].frames[0]).To(BeAssignableToTypeOf(&wire.StreamFrame{}))
|
||||
Expect(packets[1].frames[0]).To(BeAssignableToTypeOf(&wire.StreamFrame{}))
|
||||
sf1 := packets[0].frames[0].(*wire.StreamFrame)
|
||||
sf2 := packets[1].frames[0].(*wire.StreamFrame)
|
||||
Expect(sf1.StreamID).To(Equal(protocol.StreamID(42)))
|
||||
Expect(sf1.Offset).To(Equal(protocol.ByteCount(1337)))
|
||||
Expect(sf1.DataLenPresent).To(BeFalse())
|
||||
@@ -956,8 +717,6 @@ var _ = Describe("Packet packer", func() {
|
||||
It("splits STREAM frames, if necessary", func() {
|
||||
for i := 0; i < 100; i++ {
|
||||
sealingManager.EXPECT().GetSealer().Return(protocol.EncryptionForwardSecure, sealer).MaxTimes(2)
|
||||
swf := &wire.StopWaitingFrame{}
|
||||
ackFramer.EXPECT().GetStopWaitingFrame(true).Return(swf)
|
||||
sf1 := &wire.StreamFrame{
|
||||
StreamID: 42,
|
||||
Offset: 1337,
|
||||
@@ -983,9 +742,7 @@ var _ = Describe("Packet packer", func() {
|
||||
var dataLen protocol.ByteCount
|
||||
for _, p := range packets {
|
||||
for _, f := range p.frames {
|
||||
if sf, ok := f.(*wire.StreamFrame); ok {
|
||||
dataLen += sf.DataLen()
|
||||
}
|
||||
dataLen += f.(*wire.StreamFrame).DataLen()
|
||||
}
|
||||
}
|
||||
Expect(dataLen).To(Equal(expectedDataLen))
|
||||
@@ -993,8 +750,6 @@ var _ = Describe("Packet packer", func() {
|
||||
})
|
||||
|
||||
It("packs two packets for retransmission if the original packet contained many STREAM frames", func() {
|
||||
swf := &wire.StopWaitingFrame{}
|
||||
ackFramer.EXPECT().GetStopWaitingFrame(true).Return(swf)
|
||||
sealingManager.EXPECT().GetSealer().Return(protocol.EncryptionForwardSecure, sealer)
|
||||
var frames []wire.Frame
|
||||
var totalLen protocol.ByteCount
|
||||
@@ -1014,20 +769,15 @@ var _ = Describe("Packet packer", func() {
|
||||
})
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(packets).To(HaveLen(2))
|
||||
Expect(len(packets[0].frames) + len(packets[1].frames)).To(Equal(len(frames) + 2)) // all frames, plus 2 STOP_WAITING frames
|
||||
Expect(packets[0].frames[0]).To(BeAssignableToTypeOf(&wire.StopWaitingFrame{}))
|
||||
Expect(packets[1].frames[0]).To(BeAssignableToTypeOf(&wire.StopWaitingFrame{}))
|
||||
Expect(packets[0].frames[1:]).To(Equal(frames[:len(packets[0].frames)-1]))
|
||||
Expect(packets[1].frames[1:]).To(Equal(frames[len(packets[0].frames)-1:]))
|
||||
Expect(len(packets[0].frames) + len(packets[1].frames)).To(Equal(len(frames))) // all frames
|
||||
Expect(packets[1].frames).To(Equal(frames[len(packets[0].frames):]))
|
||||
// check that the first packet was filled up as far as possible:
|
||||
// if the first frame (after the STOP_WAITING) was packed into the first packet, it would have overflown the MaxPacketSize
|
||||
// if the first frame was packed into the first packet, it would have overflown the MaxPacketSize
|
||||
Expect(len(packets[0].raw) + int(packets[1].frames[1].Length(packer.version))).To(BeNumerically(">", maxPacketSize-protocol.MinStreamFrameSize))
|
||||
})
|
||||
|
||||
It("correctly sets the DataLenPresent on STREAM frames", func() {
|
||||
sealingManager.EXPECT().GetSealer().Return(protocol.EncryptionForwardSecure, sealer)
|
||||
swf := &wire.StopWaitingFrame{}
|
||||
ackFramer.EXPECT().GetStopWaitingFrame(true).Return(swf)
|
||||
frames := []wire.Frame{
|
||||
&wire.StreamFrame{StreamID: 4, Data: []byte("foobar"), DataLenPresent: true},
|
||||
&wire.StreamFrame{StreamID: 5, Data: []byte("barfoo")},
|
||||
@@ -1039,11 +789,11 @@ var _ = Describe("Packet packer", func() {
|
||||
Expect(err).ToNot(HaveOccurred())
|
||||
Expect(packets).To(HaveLen(1))
|
||||
p := packets[0]
|
||||
Expect(p.frames).To(HaveLen(3))
|
||||
Expect(p.frames).To(HaveLen(2))
|
||||
Expect(p.frames[0]).To(BeAssignableToTypeOf(&wire.StreamFrame{}))
|
||||
Expect(p.frames[1]).To(BeAssignableToTypeOf(&wire.StreamFrame{}))
|
||||
Expect(p.frames[2]).To(BeAssignableToTypeOf(&wire.StreamFrame{}))
|
||||
sf1 := p.frames[1].(*wire.StreamFrame)
|
||||
sf2 := p.frames[2].(*wire.StreamFrame)
|
||||
sf1 := p.frames[0].(*wire.StreamFrame)
|
||||
sf2 := p.frames[1].(*wire.StreamFrame)
|
||||
Expect(sf1.StreamID).To(Equal(protocol.StreamID(4)))
|
||||
Expect(sf1.DataLenPresent).To(BeTrue())
|
||||
Expect(sf2.StreamID).To(Equal(protocol.StreamID(5)))
|
||||
@@ -1062,18 +812,6 @@ var _ = Describe("Packet packer", func() {
|
||||
It("packs ACK packets", func() {
|
||||
sealingManager.EXPECT().GetSealer().Return(protocol.EncryptionForwardSecure, sealer)
|
||||
ack := &wire.AckFrame{AckRanges: []wire.AckRange{{Smallest: 1, Largest: 10}}}
|
||||
swf := &wire.StopWaitingFrame{}
|
||||
ackFramer.EXPECT().GetAckFrame().Return(ack)
|
||||
ackFramer.EXPECT().GetStopWaitingFrame(false).Return(swf)
|
||||
p, err := packer.MaybePackAckPacket()
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
Expect(p.frames).To(Equal([]wire.Frame{ack, swf}))
|
||||
})
|
||||
|
||||
It("doesn't add a STOP_WAITING frame for IETF QUIC", func() {
|
||||
sealingManager.EXPECT().GetSealer().Return(protocol.EncryptionForwardSecure, sealer)
|
||||
packer.version = versionIETFFrames
|
||||
ack := &wire.AckFrame{AckRanges: []wire.AckRange{{Smallest: 1, Largest: 10}}}
|
||||
ackFramer.EXPECT().GetAckFrame().Return(ack)
|
||||
p, err := packer.MaybePackAckPacket()
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
|
||||
Reference in New Issue
Block a user