From 9d72e8df1b171e3ab823df6790814eacbbf13433 Mon Sep 17 00:00:00 2001 From: Shunichi Shinohara Date: Mon, 18 Mar 2024 20:07:47 +0900 Subject: [PATCH 1/3] Update JAR-like files in library list --- detector/library.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/detector/library.go b/detector/library.go index 80f0c260aa..27526c1a38 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 { @@ -73,6 +73,7 @@ func DetectLibsCves(r *models.ScanResult, trivyOpts config.TrivyOpts, logOpts lo } vinfos, err := d.scan() + r.LibraryScanners[i] = d.scanner if err != nil { return xerrors.Errorf("Failed to scan library. err: %w", err) } @@ -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) From eb6f07428be9786a182c58e7fd7aa92ea03b8f49 Mon Sep 17 00:00:00 2001 From: Shunichi Shinohara Date: Tue, 19 Mar 2024 14:24:41 +0900 Subject: [PATCH 2/3] Update detector/library.go Co-authored-by: MaineK00n --- detector/library.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/detector/library.go b/detector/library.go index 27526c1a38..3d022b005b 100644 --- a/detector/library.go +++ b/detector/library.go @@ -73,10 +73,11 @@ func DetectLibsCves(r *models.ScanResult, trivyOpts config.TrivyOpts, logOpts lo } vinfos, err := d.scan() - r.LibraryScanners[i] = d.scanner 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 { From 65cc7591504789ad2e449c46cd57ac71aebb46d5 Mon Sep 17 00:00:00 2001 From: MaineK00n Date: Tue, 19 Mar 2024 14:58:23 +0900 Subject: [PATCH 3/3] Update detector/library.go --- detector/library.go | 1 - 1 file changed, 1 deletion(-) diff --git a/detector/library.go b/detector/library.go index 3d022b005b..6b548c59a3 100644 --- a/detector/library.go +++ b/detector/library.go @@ -77,7 +77,6 @@ func DetectLibsCves(r *models.ScanResult, trivyOpts config.TrivyOpts, logOpts lo 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 {