deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2026-03-14 14:35:44 +01:00
Code Issues Releases Wiki Activity

Fix race condition in flaky certificate/CA reload tests.

Browse source
This commit is contained in:
Joachim Bauch 2025-04-16 13:57:13 +02:00
commit 951532d3b3
No known key found for this signature in database
GPG key ID: 77C1D22D53E15F02
3 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
certificate_reloader_test.go
View file

@ -39,8 +39,7 @@ func UpdateCertificateCheckIntervalForTest(t *testing.T, interval time.Duration)
deduplicateWatchEvents.Store(int64(interval))
}
func (r *CertificateReloader) WaitForReload(ctx context.Context) error {
counter := r.GetReloadCounter()
func (r *CertificateReloader) WaitForReload(ctx context.Context, counter uint64) error {
for counter == r.GetReloadCounter() {
if err := ctx.Err(); err != nil {
return err
@ -50,8 +49,7 @@ func (r *CertificateReloader) WaitForReload(ctx context.Context) error {
return nil
}
func (r *CertPoolReloader) WaitForReload(ctx context.Context) error {
counter := r.GetReloadCounter()
func (r *CertPoolReloader) WaitForReload(ctx context.Context, counter uint64) error {
for counter == r.GetReloadCounter() {
if err := ctx.Err(); err != nil {
return err

8
grpc_common_test.go
View file

@ -39,20 +39,20 @@ import (
"github.com/stretchr/testify/require"
)
func (c *reloadableCredentials) WaitForCertificateReload(ctx context.Context) error {
func (c *reloadableCredentials) WaitForCertificateReload(ctx context.Context, counter uint64) error {
if c.loader == nil {
return errors.New("no certificate loaded")
}
return c.loader.WaitForReload(ctx)
return c.loader.WaitForReload(ctx, counter)
}
func (c *reloadableCredentials) WaitForCertPoolReload(ctx context.Context) error {
func (c *reloadableCredentials) WaitForCertPoolReload(ctx context.Context, counter uint64) error {
if c.pool == nil {
return errors.New("no certificate pool loaded")
}
return c.pool.WaitForReload(ctx)
return c.pool.WaitForReload(ctx, counter)
}
func GenerateSelfSignedCertificateForTesting(t *testing.T, bits int, organization string, key *rsa.PrivateKey) []byte {

12
grpc_server_test.go
View file

@ -43,22 +43,22 @@ import (
"google.golang.org/grpc/credentials"
)
func (s *GrpcServer) WaitForCertificateReload(ctx context.Context) error {
func (s *GrpcServer) WaitForCertificateReload(ctx context.Context, counter uint64) error {
c, ok := s.creds.(*reloadableCredentials)
if !ok {
return errors.New("no reloadable credentials found")
}
return c.WaitForCertificateReload(ctx)
return c.WaitForCertificateReload(ctx, counter)
}
func (s *GrpcServer) WaitForCertPoolReload(ctx context.Context) error {
func (s *GrpcServer) WaitForCertPoolReload(ctx context.Context, counter uint64) error {
c, ok := s.creds.(*reloadableCredentials)
if !ok {
return errors.New("no reloadable credentials found")
}
return c.WaitForCertPoolReload(ctx)
return c.WaitForCertPoolReload(ctx, counter)
}
func NewGrpcServerForTestWithConfig(t *testing.T, config *goconf.ConfigFile) (server *GrpcServer, addr string) {
@ -145,7 +145,7 @@ func Test_GrpcServer_ReloadCerts(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()
require.NoError(server.WaitForCertificateReload(ctx))
require.NoError(server.WaitForCertificateReload(ctx, 0))
cp2 := x509.NewCertPool()
if !cp2.AppendCertsFromPEM(cert2) {
@ -225,7 +225,7 @@ func Test_GrpcServer_ReloadCA(t *testing.T) {
clientCert2 := GenerateSelfSignedCertificateForTesting(t, 1024, org2, clientKey)
replaceFile(t, caFile, clientCert2, 0755)
require.NoError(server.WaitForCertPoolReload(ctx1))
require.NoError(server.WaitForCertPoolReload(ctx1, 0))
pair2, err := tls.X509KeyPair(clientCert2, pem.EncodeToMemory(&pem.Block{
Type: "RSA PRIVATE KEY",