gitea-mirror/trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2025-12-22 15:16:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

fix(db): check DownloadedAt for trivy-java-db (#7592)

Browse Source
This commit is contained in:
DmitriyLewen
2024-09-26 23:26:50 +06:00
committed by GitHub
parent 3fa24e890e
commit 13ef3e7d62
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/javadb/client.go
View File

@@ -53,7 +53,7 @@ func (u *Updater) Update() error {
} }
} }
if (meta.Version != SchemaVersion || meta.NextUpdate.Before(time.Now().UTC())) && !u.skip { if (meta.Version != SchemaVersion || !u.isNewDB(meta)) && !u.skip {
// Download DB // Download DB
log.Info("Java DB Repository", log.Any("repository", u.repo)) log.Info("Java DB Repository", log.Any("repository", u.repo))
log.Info("Downloading the Java DB...") log.Info("Downloading the Java DB...")
@@ -85,6 +85,20 @@ func (u *Updater) Update() error {
return nil return nil
} }
func (u *Updater) isNewDB(meta db.Metadata) bool {
now := time.Now().UTC()
if now.Before(meta.NextUpdate) {
log.Debug("Java DB update was skipped because the local Java DB is the latest")
return true
}
if now.Before(meta.DownloadedAt.Add(time.Hour * 24)) { // 1 day
log.Debug("Java DB update was skipped because the local Java DB was downloaded during the last day")
return true
}
return false
}
func Init(cacheDir string, javaDBRepository name.Reference, skip, quiet bool, registryOption ftypes.RegistryOptions) { func Init(cacheDir string, javaDBRepository name.Reference, skip, quiet bool, registryOption ftypes.RegistryOptions) {
updater = &Updater{ updater = &Updater{
repo: javaDBRepository, repo: javaDBRepository,