From 99cf9dbccd96640c808a4e6ce07b36fa7c34bb5c Mon Sep 17 00:00:00 2001 From: Shunichi Shinohara Date: Tue, 19 Mar 2024 15:17:37 +0900 Subject: [PATCH] feat(detector/library): update JAR-like files' Name/Version in library list (#1874) * Update JAR-like files in library list * Update detector/library.go Co-authored-by: MaineK00n * Update detector/library.go --------- Co-authored-by: MaineK00n --- detector/library.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/detector/library.go b/detector/library.go index 80f0c260..6b548c59 100644 --- a/detector/library.go +++ b/detector/library.go @@ -56,7 +56,7 @@ func DetectLibsCves(r *models.ScanResult, trivyOpts config.TrivyOpts, logOpts lo var javaDBClient *javadb.DBClient defer javaDBClient.Close() - for _, lib := range r.LibraryScanners { + for i, lib := range r.LibraryScanners { d := libraryDetector{scanner: lib} if lib.Type == ftypes.Jar { if javaDBClient == nil { @@ -76,6 +76,7 @@ func DetectLibsCves(r *models.ScanResult, trivyOpts config.TrivyOpts, logOpts lo if err != nil { return xerrors.Errorf("Failed to scan library. err: %w", err) } + r.LibraryScanners[i] = d.scanner for _, vinfo := range vinfos { vinfo.Confidences.AppendIfMissing(models.TrivyMatch) if v, ok := r.ScannedCves[vinfo.CveID]; !ok { @@ -129,7 +130,7 @@ func showDBInfo(cacheDir string) error { } // Scan : scan target library -func (d libraryDetector) scan() ([]models.VulnInfo, error) { +func (d *libraryDetector) scan() ([]models.VulnInfo, error) { if d.scanner.Type == ftypes.Jar { if err := d.improveJARInfo(); err != nil { return nil, xerrors.Errorf("Failed to improve JAR information by trivy Java DB. err: %w", err)