mirror of
https://github.com/refraction-networking/uquic.git
synced 2025-04-04 04:37:36 +03:00
use the new crypto/tls QUIC Transport (#3860)
This commit is contained in:
Marten Seemann
GitHub
parent
4998733ae1
commit
3d89e545d3
55 changed files with 2197 additions and 1509 deletions
|
|
@ -119,7 +119,7 @@ var _ = Describe("Connection", func() {
|
|||
&protocol.DefaultConnectionIDGenerator{},
|
||||
protocol.StatelessResetToken{},
|
||||
populateServerConfig(&Config{DisablePathMTUDiscovery: true}),
|
||||
nil, // tls.Config
|
||||
&tls.Config{},
|
||||
tokenGenerator,
|
||||
false,
|
||||
tracer,
|
||||
|
|
@ -357,7 +357,7 @@ var _ = Describe("Connection", func() {
|
|||
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
Expect(conn.run()).To(MatchError(expectedErr))
|
||||
}()
|
||||
Expect(conn.handleFrame(&wire.ConnectionCloseFrame{
|
||||
|
|
@ -385,7 +385,7 @@ var _ = Describe("Connection", func() {
|
|||
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
Expect(conn.run()).To(MatchError(testErr))
|
||||
}()
|
||||
ccf := &wire.ConnectionCloseFrame{
|
||||
|
|
@ -432,7 +432,7 @@ var _ = Describe("Connection", func() {
|
|||
runConn := func() {
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
runErr <- conn.run()
|
||||
}()
|
||||
Eventually(areConnsRunning).Should(BeTrue())
|
||||
|
|
@ -811,7 +811,7 @@ var _ = Describe("Connection", func() {
|
|||
packer.EXPECT().PackConnectionClose(gomock.Any(), gomock.Any(), conn.version).Return(&coalescedPacket{buffer: getPacketBuffer()}, nil)
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
expectReplaceWithClosed()
|
||||
|
|
@ -853,7 +853,7 @@ var _ = Describe("Connection", func() {
|
|||
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
Consistently(conn.Context().Done()).ShouldNot(BeClosed())
|
||||
|
|
@ -888,7 +888,7 @@ var _ = Describe("Connection", func() {
|
|||
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
Consistently(conn.Context().Done()).ShouldNot(BeClosed())
|
||||
|
|
@ -913,7 +913,7 @@ var _ = Describe("Connection", func() {
|
|||
done := make(chan struct{})
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
err := conn.run()
|
||||
Expect(err).To(HaveOccurred())
|
||||
Expect(err).To(BeAssignableToTypeOf(&qerr.TransportError{}))
|
||||
|
|
@ -937,7 +937,7 @@ var _ = Describe("Connection", func() {
|
|||
runErr := make(chan error)
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
runErr <- conn.run()
|
||||
}()
|
||||
expectReplaceWithClosed()
|
||||
|
|
@ -961,7 +961,7 @@ var _ = Describe("Connection", func() {
|
|||
done := make(chan struct{})
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
err := conn.run()
|
||||
Expect(err).To(HaveOccurred())
|
||||
Expect(err).To(BeAssignableToTypeOf(&qerr.TransportError{}))
|
||||
|
|
@ -1197,7 +1197,7 @@ var _ = Describe("Connection", func() {
|
|||
runConn := func() {
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
close(connDone)
|
||||
}()
|
||||
|
|
@ -1415,7 +1415,7 @@ var _ = Describe("Connection", func() {
|
|||
})
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
conn.scheduleSending()
|
||||
|
|
@ -1439,7 +1439,7 @@ var _ = Describe("Connection", func() {
|
|||
})
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
conn.scheduleSending()
|
||||
|
|
@ -1463,7 +1463,7 @@ var _ = Describe("Connection", func() {
|
|||
})
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
conn.scheduleSending()
|
||||
|
|
@ -1479,7 +1479,7 @@ var _ = Describe("Connection", func() {
|
|||
sender.EXPECT().Send(gomock.Any(), gomock.Any())
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
conn.scheduleSending()
|
||||
|
|
@ -1496,7 +1496,7 @@ var _ = Describe("Connection", func() {
|
|||
sender.EXPECT().Send(gomock.Any(), gomock.Any())
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
conn.scheduleSending()
|
||||
|
|
@ -1514,7 +1514,7 @@ var _ = Describe("Connection", func() {
|
|||
sender.EXPECT().Send(gomock.Any(), gomock.Any())
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
conn.scheduleSending()
|
||||
|
|
@ -1540,7 +1540,7 @@ var _ = Describe("Connection", func() {
|
|||
sender.EXPECT().Send(gomock.Any(), gomock.Any()).DoAndReturn(func(*packetBuffer, protocol.ByteCount) { written <- struct{}{} }).Times(2)
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
conn.scheduleSending()
|
||||
|
|
@ -1562,7 +1562,7 @@ var _ = Describe("Connection", func() {
|
|||
sender.EXPECT().Send(gomock.Any(), gomock.Any()).DoAndReturn(func(*packetBuffer, protocol.ByteCount) { written <- struct{}{} }).Times(3)
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
conn.scheduleSending()
|
||||
|
|
@ -1580,7 +1580,7 @@ var _ = Describe("Connection", func() {
|
|||
sender.EXPECT().Available().Return(available)
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
conn.scheduleSending()
|
||||
|
|
@ -1602,7 +1602,7 @@ var _ = Describe("Connection", func() {
|
|||
sender.EXPECT().WouldBlock().AnyTimes()
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
|
||||
|
|
@ -1633,7 +1633,7 @@ var _ = Describe("Connection", func() {
|
|||
sender.EXPECT().Send(gomock.Any(), gomock.Any()).DoAndReturn(func(*packetBuffer, protocol.ByteCount) { written <- struct{}{} })
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
available := make(chan struct{}, 1)
|
||||
|
|
@ -1664,7 +1664,7 @@ var _ = Describe("Connection", func() {
|
|||
// don't EXPECT any calls to mconn.Write()
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
conn.scheduleSending() // no packet will get sent
|
||||
|
|
@ -1687,7 +1687,7 @@ var _ = Describe("Connection", func() {
|
|||
packer.EXPECT().PackMTUProbePacket(ping, protocol.ByteCount(1234), conn.version).Return(shortHeaderPacket{PacketNumber: 1}, getPacketBuffer(), nil)
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
conn.scheduleSending()
|
||||
|
|
@ -1734,7 +1734,7 @@ var _ = Describe("Connection", func() {
|
|||
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
// don't EXPECT any calls to mconn.Write()
|
||||
|
|
@ -1768,7 +1768,7 @@ var _ = Describe("Connection", func() {
|
|||
tracer.EXPECT().SentShortHeaderPacket(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
Eventually(written).Should(BeClosed())
|
||||
|
|
@ -1832,7 +1832,7 @@ var _ = Describe("Connection", func() {
|
|||
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
|
||||
|
|
@ -1864,7 +1864,7 @@ var _ = Describe("Connection", func() {
|
|||
go func() {
|
||||
defer GinkgoRecover()
|
||||
<-finishHandshake
|
||||
cryptoSetup.EXPECT().RunHandshake()
|
||||
cryptoSetup.EXPECT().StartHandshake()
|
||||
cryptoSetup.EXPECT().SetHandshakeConfirmed()
|
||||
cryptoSetup.EXPECT().GetSessionTicket()
|
||||
close(conn.handshakeCompleteChan)
|
||||
|
|
@ -1894,7 +1894,7 @@ var _ = Describe("Connection", func() {
|
|||
go func() {
|
||||
defer GinkgoRecover()
|
||||
<-finishHandshake
|
||||
cryptoSetup.EXPECT().RunHandshake()
|
||||
cryptoSetup.EXPECT().StartHandshake()
|
||||
cryptoSetup.EXPECT().SetHandshakeConfirmed()
|
||||
cryptoSetup.EXPECT().GetSessionTicket().Return(make([]byte, size), nil)
|
||||
close(conn.handshakeCompleteChan)
|
||||
|
|
@ -1941,7 +1941,7 @@ var _ = Describe("Connection", func() {
|
|||
tracer.EXPECT().Close()
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake()
|
||||
cryptoSetup.EXPECT().StartHandshake()
|
||||
conn.run()
|
||||
}()
|
||||
handshakeCtx := conn.HandshakeComplete()
|
||||
|
|
@ -1974,7 +1974,7 @@ var _ = Describe("Connection", func() {
|
|||
packer.EXPECT().AppendPacket(gomock.Any(), gomock.Any(), conn.version).Return(shortHeaderPacket{}, errNothingToPack).AnyTimes()
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake()
|
||||
cryptoSetup.EXPECT().StartHandshake()
|
||||
cryptoSetup.EXPECT().SetHandshakeConfirmed()
|
||||
cryptoSetup.EXPECT().GetSessionTicket()
|
||||
mconn.EXPECT().Write(gomock.Any(), gomock.Any())
|
||||
|
|
@ -1997,7 +1997,7 @@ var _ = Describe("Connection", func() {
|
|||
done := make(chan struct{})
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
Expect(conn.run()).To(Succeed())
|
||||
close(done)
|
||||
}()
|
||||
|
|
@ -2017,7 +2017,7 @@ var _ = Describe("Connection", func() {
|
|||
done := make(chan struct{})
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
err := conn.run()
|
||||
Expect(err).To(MatchError(&qerr.ApplicationError{
|
||||
ErrorCode: 0x1337,
|
||||
|
|
@ -2069,7 +2069,7 @@ var _ = Describe("Connection", func() {
|
|||
runConn := func() {
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
}
|
||||
|
|
@ -2171,7 +2171,7 @@ var _ = Describe("Connection", func() {
|
|||
)
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
err := conn.run()
|
||||
nerr, ok := err.(net.Error)
|
||||
Expect(ok).To(BeTrue())
|
||||
|
|
@ -2196,7 +2196,7 @@ var _ = Describe("Connection", func() {
|
|||
done := make(chan struct{})
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
err := conn.run()
|
||||
nerr, ok := err.(net.Error)
|
||||
Expect(ok).To(BeTrue())
|
||||
|
|
@ -2229,7 +2229,7 @@ var _ = Describe("Connection", func() {
|
|||
// and not on the last network activity
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
Consistently(conn.Context().Done()).ShouldNot(BeClosed())
|
||||
|
|
@ -2256,7 +2256,7 @@ var _ = Describe("Connection", func() {
|
|||
conn.handshakeComplete = false
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().GetSessionTicket().MaxTimes(1)
|
||||
err := conn.run()
|
||||
nerr, ok := err.(net.Error)
|
||||
|
|
@ -2285,7 +2285,7 @@ var _ = Describe("Connection", func() {
|
|||
done := make(chan struct{})
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().GetSessionTicket().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().SetHandshakeConfirmed().MaxTimes(1)
|
||||
close(conn.handshakeCompleteChan)
|
||||
|
|
@ -2305,7 +2305,7 @@ var _ = Describe("Connection", func() {
|
|||
conn.idleTimeout = 30 * time.Second
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
Consistently(conn.Context().Done()).ShouldNot(BeClosed())
|
||||
|
|
@ -2336,7 +2336,7 @@ var _ = Describe("Connection", func() {
|
|||
pto := conn.rttStats.PTO(true)
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().GetSessionTicket().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().SetHandshakeConfirmed().MaxTimes(1)
|
||||
close(conn.handshakeCompleteChan)
|
||||
|
|
@ -2508,7 +2508,7 @@ var _ = Describe("Client Connection", func() {
|
|||
conn.unpacker = unpacker
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
conn.run()
|
||||
}()
|
||||
newConnID := protocol.ParseConnectionID([]byte{1, 3, 3, 7, 1, 3, 3, 7})
|
||||
|
|
@ -2588,7 +2588,7 @@ var _ = Describe("Client Connection", func() {
|
|||
tracer.EXPECT().ClosedConnection(gomock.Any())
|
||||
tracer.EXPECT().Close()
|
||||
running := make(chan struct{})
|
||||
cryptoSetup.EXPECT().RunHandshake().Do(func() {
|
||||
cryptoSetup.EXPECT().StartHandshake().Do(func() {
|
||||
close(running)
|
||||
conn.closeLocal(errors.New("early error"))
|
||||
})
|
||||
|
|
@ -2641,7 +2641,7 @@ var _ = Describe("Client Connection", func() {
|
|||
errChan := make(chan error, 1)
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
errChan <- conn.run()
|
||||
}()
|
||||
connRunner.EXPECT().Remove(srcConnID)
|
||||
|
|
@ -2666,7 +2666,7 @@ var _ = Describe("Client Connection", func() {
|
|||
errChan := make(chan error, 1)
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
errChan <- conn.run()
|
||||
}()
|
||||
connRunner.EXPECT().Remove(srcConnID).MaxTimes(1)
|
||||
|
|
@ -2774,7 +2774,7 @@ var _ = Describe("Client Connection", func() {
|
|||
closed = false
|
||||
go func() {
|
||||
defer GinkgoRecover()
|
||||
cryptoSetup.EXPECT().RunHandshake().MaxTimes(1)
|
||||
cryptoSetup.EXPECT().StartHandshake().MaxTimes(1)
|
||||
errChan <- conn.run()
|
||||
close(errChan)
|
||||
}()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue