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

fix race condition in tests when setting the key update interval (#5121)

Browse Source 
* fix race conditions in tests when setting the key update interval

* remove test for running transports and handshakes
This commit is contained in:
Marten Seemann
2025-05-06 10:45:27 +08:00
committed by GitHub
parent 4c6aca6b43
commit cfc6c16f36
4 changed files with 20 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
internal/handshake/updatable_aead.go
View File

@@ -6,6 +6,9 @@ import (
"crypto/tls"
"encoding/binary"
"fmt"
"os"
"strconv"
"testing"
"time"
"github.com/quic-go/quic-go/internal/protocol"
@@ -14,9 +17,15 @@ import (
"github.com/quic-go/quic-go/logging"
)
// KeyUpdateInterval is the maximum number of packets we send or receive before initiating a key update.
// It's a package-level variable to allow modifying it for testing purposes.
var KeyUpdateInterval uint64 = protocol.KeyUpdateInterval
func keyUpdateInterval() uint64 {
// Reparsing the environment variable is not very performant, but it's only done in tests.
if testing.Testing() {
if v, err := strconv.ParseUint(os.Getenv("QUIC_GO_TEST_KEY_UPDATE_INTERVAL"), 10, 64); err == nil {
return v
}
}
return protocol.KeyUpdateInterval
}
// FirstKeyUpdateInterval is the maximum number of packets we send or receive before initiating the first key update.
// It's a package-level variable to allow modifying it for testing purposes.
@@ -293,11 +302,11 @@ func (a *updatableAEAD) shouldInitiateKeyUpdate() bool {
return true
}
}
if a.numRcvdWithCurrentKey >= KeyUpdateInterval {
if a.numRcvdWithCurrentKey >= keyUpdateInterval() {
a.logger.Debugf("Received %d packets with current key phase. Initiating key update to the next key phase: %d", a.numRcvdWithCurrentKey, a.keyPhase+1)
return true
}
if a.numSentWithCurrentKey >= KeyUpdateInterval {
if a.numSentWithCurrentKey >= keyUpdateInterval() {
a.logger.Debugf("Sent %d packets with current key phase. Initiating key update to the next key phase: %d", a.numSentWithCurrentKey, a.keyPhase+1)
return true
}

11
internal/handshake/updatable_aead_test.go
View File

@@ -330,15 +330,12 @@ func TestRejectFrequentKeyUpdates(t *testing.T) {
}
func setKeyUpdateIntervals(t *testing.T, firstKeyUpdateInterval, keyUpdateInterval uint64) {
origKeyUpdateInterval := KeyUpdateInterval
t.Setenv("QUIC_GO_TEST_KEY_UPDATE_INTERVAL", fmt.Sprintf("%d", keyUpdateInterval))
origFirstKeyUpdateInterval := FirstKeyUpdateInterval
KeyUpdateInterval = keyUpdateInterval
FirstKeyUpdateInterval = firstKeyUpdateInterval
t.Cleanup(func() {
KeyUpdateInterval = origKeyUpdateInterval
FirstKeyUpdateInterval = origFirstKeyUpdateInterval
})
t.Cleanup(func() { FirstKeyUpdateInterval = origFirstKeyUpdateInterval })
}
func TestInitiateKeyUpdateAfterSendingMaxPackets(t *testing.T) {
@@ -382,7 +379,7 @@ func TestInitiateKeyUpdateAfterSendingMaxPackets(t *testing.T) {
func TestKeyUpdateEnforceACKKeyPhase(t *testing.T) {
const firstKeyUpdateInterval = 5
setKeyUpdateIntervals(t, firstKeyUpdateInterval, KeyUpdateInterval)
setKeyUpdateIntervals(t, firstKeyUpdateInterval, protocol.KeyUpdateInterval)
_, server, serverTracer := setupEndpoints(t, &utils.RTTStats{})
server.SetHandshakeConfirmed()