luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Require activity log retention months at least the minimum (#20078) 

* reject retention month updates that are less than min retention months

* add changelog

* reword error

* switch to retention_months
This commit is contained in:
miagilepner 2023-04-11 17:09:01 +02:00 committed by GitHub
parent 5389477107
commit c8b4afd189
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/20078.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
core/activity: error when attempting to update retention configuration below the minimum
```

4
vault/logical_system_activity.go
View File

@ -351,6 +351,10 @@ func (b *SystemBackend) handleActivityConfigUpdate(ctx context.Context, req *log
return logical.ErrorResponse("retention_months cannot be 0 while enabled"), logical.ErrInvalidRequest return logical.ErrorResponse("retention_months cannot be 0 while enabled"), logical.ErrInvalidRequest
} }
if a.core.censusLicensingEnabled && config.RetentionMonths < a.configOverrides.MinimumRetentionMonths {
return logical.ErrorResponse("retention_months must be at least %d while Reporting is enabled", a.configOverrides.MinimumRetentionMonths), logical.ErrInvalidRequest
}
// Store the config // Store the config
entry, err := logical.StorageEntryJSON(path.Join(activitySubPath, activityConfigKey), config) entry, err := logical.StorageEntryJSON(path.Join(activitySubPath, activityConfigKey), config)
if err != nil { if err != nil {