deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2024-05-08 00:26:32 +02:00
Code Issues Releases Wiki Activity

Make sure replaced files have different modification times.

Browse source 
Depending on filesystem time resolution, the modified certificates could
have the same timestamp in tests, causing the reload to fail.
This commit is contained in:
Joachim Bauch 2022-07-08 10:06:15 +02:00
parent 75e5013dd8
commit 8704bc3b5b
No known key found for this signature in database
GPG key ID: 77C1D22D53E15F02
2 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
grpc_common_test.go
View file

@ -27,6 +27,7 @@ import (
"crypto/x509"
"crypto/x509/pkix"
"encoding/pem"
"io/fs"
"math/big"
"net"
"os"
@ -86,3 +87,32 @@ func WritePublicKey(key *rsa.PublicKey, filename string) error {
return os.WriteFile(filename, data, 0755)
}
func replaceFile(t *testing.T, filename string, data []byte, perm fs.FileMode) {
t.Helper()
oldStat, err := os.Stat(filename)
if err != nil {
t.Fatalf("can't stat old file %s: %s", filename, err)
return
}
for {
if err := os.WriteFile(filename, data, perm); err != nil {
t.Fatalf("can't write file %s: %s", filename, err)
return
}
newStat, err := os.Stat(filename)
if err != nil {
t.Fatalf("can't stat new file %s: %s", filename, err)
return
}
// We need different modification times.
if !newStat.ModTime().Equal(oldStat.ModTime()) {
break
}
time.Sleep(time.Millisecond)
}
}

4
grpc_server_test.go
View file

@ -126,7 +126,7 @@ func Test_GrpcServer_ReloadCerts(t *testing.T) {
org2 := "Updated certificate"
cert2 := GenerateSelfSignedCertificateForTesting(t, 1024, org2, key)
os.WriteFile(certFile, cert2, 0755) // nolint
replaceFile(t, certFile, cert2, 0755)
cp2 := x509.NewCertPool()
if !cp2.AppendCertsFromPEM(cert2) {
@ -215,7 +215,7 @@ func Test_GrpcServer_ReloadCA(t *testing.T) {
org2 := "Updated client"
clientCert2 := GenerateSelfSignedCertificateForTesting(t, 1024, org2, clientKey)
os.WriteFile(caFile, clientCert2, 0755) // nolint
replaceFile(t, caFile, clientCert2, 0755)
pair2, err := tls.X509KeyPair(clientCert2, pem.EncodeToMemory(&pem.Block{
Type: "RSA PRIVATE KEY",