mirror of
https://github.com/empayre/fleet.git
synced 2024-11-06 08:55:24 +00:00
fix: use other field for checking vuln scanning status (#15720)
# Checklist for submitter To test, go through the repro steps in the issue; you should see that the field is true instead of false! If some of the following don't apply, delete the relevant line. <!-- Note that API documentation changes are now addressed by the product design team. --> - [x] Changes file added for user-visible changes in `changes/` or `orbit/changes/`. See [Changes files](https://fleetdm.com/docs/contributing/committing-changes#changes-files) for more information. - [x] Added/updated tests - [x] Manual QA for all new/changed functionality
This commit is contained in:
parent
682ab4aa7e
commit
367459fe02
1
changes/15213-vuln-enabled
Normal file
1
changes/15213-vuln-enabled
Normal file
@ -0,0 +1 @@
|
||||
- Fixes a bug that caused vulnerability scanning status to be misreported in analytics.
|
@ -81,7 +81,7 @@ func (ds *Datastore) ShouldSendStatistics(ctx context.Context, frequency time.Du
|
||||
stats.NumPolicies = amountPolicies
|
||||
stats.NumLabels = amountLabels
|
||||
stats.SoftwareInventoryEnabled = appConfig.Features.EnableSoftwareInventory
|
||||
stats.VulnDetectionEnabled = appConfig.VulnerabilitySettings.DatabasesPath != ""
|
||||
stats.VulnDetectionEnabled = config.Vulnerabilities.DatabasesPath != "" || appConfig.VulnerabilitySettings.DatabasesPath != ""
|
||||
stats.SystemUsersEnabled = appConfig.Features.EnableHostUsers
|
||||
stats.HostsStatusWebHookEnabled = appConfig.WebhookSettings.HostStatusWebhook.Enable
|
||||
stats.MDMMacOsEnabled = appConfig.MDM.EnabledAndConfigured
|
||||
|
@ -145,8 +145,8 @@ func testStatisticsShouldSend(t *testing.T, ds *Datastore) {
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
// Create new app config for test
|
||||
config, err := ds.NewAppConfig(ctx, &fleet.AppConfig{
|
||||
// Create new app cfg for test
|
||||
cfg, err := ds.NewAppConfig(ctx, &fleet.AppConfig{
|
||||
OrgInfo: fleet.OrgInfo{
|
||||
OrgName: "Test",
|
||||
OrgLogoURL: "localhost:8080/logo.png",
|
||||
@ -168,15 +168,15 @@ func testStatisticsShouldSend(t *testing.T, ds *Datastore) {
|
||||
require.NoError(t, err)
|
||||
|
||||
require.NoError(t, err)
|
||||
config.Features.EnableSoftwareInventory = false
|
||||
config.Features.EnableHostUsers = false
|
||||
config.VulnerabilitySettings.DatabasesPath = ""
|
||||
config.WebhookSettings.HostStatusWebhook.Enable = true
|
||||
config.MDM.EnabledAndConfigured = true
|
||||
config.HostExpirySettings.HostExpiryEnabled = true
|
||||
config.MDM.WindowsEnabledAndConfigured = true
|
||||
config.ServerSettings.LiveQueryDisabled = true
|
||||
err = ds.SaveAppConfig(ctx, config)
|
||||
cfg.Features.EnableSoftwareInventory = false
|
||||
cfg.Features.EnableHostUsers = false
|
||||
cfg.VulnerabilitySettings.DatabasesPath = ""
|
||||
cfg.WebhookSettings.HostStatusWebhook.Enable = true
|
||||
cfg.MDM.EnabledAndConfigured = true
|
||||
cfg.HostExpirySettings.HostExpiryEnabled = true
|
||||
cfg.MDM.WindowsEnabledAndConfigured = true
|
||||
cfg.ServerSettings.LiveQueryDisabled = true
|
||||
err = ds.SaveAppConfig(ctx, cfg)
|
||||
require.NoError(t, err)
|
||||
|
||||
time.Sleep(1100 * time.Millisecond) // ensure the DB timestamp is not in the same second
|
||||
@ -364,4 +364,10 @@ func testStatisticsShouldSend(t *testing.T, ds *Datastore) {
|
||||
assert.Equal(t, firstIdentifier, stats.AnonymousIdentifier)
|
||||
assert.Equal(t, "free", stats.LicenseTier)
|
||||
assert.Equal(t, "unknown", stats.Organization)
|
||||
|
||||
fleetConfig.Vulnerabilities = config.VulnerabilitiesConfig{DatabasesPath: "some/path/vulns"}
|
||||
stats, shouldSend, err = ds.ShouldSendStatistics(license.NewContext(ctx, freeLicense), time.Millisecond, fleetConfig)
|
||||
require.NoError(t, err)
|
||||
assert.True(t, shouldSend)
|
||||
assert.True(t, stats.VulnDetectionEnabled)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user