Stage/vuls
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(detector/library): update JAR-like files' Name/Version in library list (#1874)

Browse Source 
* Update JAR-like files in library list

* Update detector/library.go

Co-authored-by: MaineK00n <mainek00n.1229@gmail.com>

* Update detector/library.go

---------

Co-authored-by: MaineK00n <mainek00n.1229@gmail.com>
This commit is contained in:
Shunichi Shinohara
2024-03-19 15:17:37 +09:00
committed by GitHub
parent e1df74cbc1
commit 99cf9dbccd
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
detector/library.go
View File

@@ -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)