Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Fix race in mock datastore for recent_vulns test (#4230)

Browse source
This commit is contained in:
Martin Angers 2022-02-16 09:23:27 -05:00 committed by GitHub
parent 68b0a33aee
commit 80079e4fd7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
server/vulnerabilities/cve_test.go
View file

@ -43,6 +43,23 @@ func bToMb(b uint64) uint64 {
return b / 1024 / 1024
}
type threadSafeDSMock struct {
mu sync.Mutex
*mock.Store
}
func (d *threadSafeDSMock) AllCPEs(ctx context.Context) ([]string, error) {
d.mu.Lock()
defer d.mu.Unlock()
return d.Store.AllCPEs(ctx)
}
func (d *threadSafeDSMock) InsertCVEForCPE(ctx context.Context, cve string, cpes []string) (int64, error) {
d.mu.Lock()
defer d.mu.Unlock()
return d.Store.InsertCVEForCPE(ctx, cve, cpes)
}
func TestTranslateCPEToCVE(t *testing.T) {
if os.Getenv("NETWORK_TEST") == "" {
t.Skip("set environment variable NETWORK_TEST=1 to run")
@ -97,6 +114,8 @@ func TestTranslateCPEToCVE(t *testing.T) {
recentVulnMaxAge = 365 * 24 * time.Hour
defer func() { recentVulnMaxAge = oldMaxAge; theClock = clock.C }()
safeDS := &threadSafeDSMock{Store: ds}
ds.AllCPEsFunc = func(ctx context.Context) ([]string, error) {
return []string{googleChromeCPE, mozillaFirefoxCPE, curlCPE}, nil
}
@ -104,7 +123,7 @@ func TestTranslateCPEToCVE(t *testing.T) {
ds.InsertCVEForCPEFunc = func(ctx context.Context, cve string, cpes []string) (int64, error) {
return 1, nil
}
recent, err := TranslateCPEToCVE(ctx, ds, tempDir, kitlog.NewNopLogger(), cfg, true)
recent, err := TranslateCPEToCVE(ctx, safeDS, tempDir, kitlog.NewNopLogger(), cfg, true)
require.NoError(t, err)
byCPE := make(map[string]int)
@ -126,7 +145,7 @@ func TestTranslateCPEToCVE(t *testing.T) {
ds.InsertCVEForCPEFunc = func(ctx context.Context, cve string, cpes []string) (int64, error) {
return 0, nil
}
recent, err = TranslateCPEToCVE(ctx, ds, tempDir, kitlog.NewNopLogger(), cfg, true)
recent, err = TranslateCPEToCVE(ctx, safeDS, tempDir, kitlog.NewNopLogger(), cfg, true)
require.NoError(t, err)
// no recent vulnerability should be reported