Skip to content

Commit 0720af1

Browse files
committed
fix bad conversion assumptions
1 parent 017eaf8 commit 0720af1

1 file changed

Lines changed: 9 additions & 11 deletions

File tree

vulnfeeds/cvelist2osv/default_extractor.go

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package cvelist2osv
22

33
import (
4-
"log/slog"
5-
64
"github.com/google/osv/vulnfeeds/conversion"
75
"github.com/google/osv/vulnfeeds/cves"
86
"github.com/google/osv/vulnfeeds/git"
@@ -40,9 +38,9 @@ func (d *DefaultVersionExtractor) ExtractVersions(cve models.CVE5, v *vulns.Vuln
4038
ranges := d.handleAffected(cve.Containers.CNA.Affected, metrics)
4139

4240
if len(ranges) != 0 {
43-
resolvedRanges, unresolvedRanges, err := conversion.GitVersionsToCommits(ranges, repos, metrics, repoTagsCache)
44-
if err != nil {
45-
logger.Error("Failed to convert git versions to commits", slog.Any("err", err))
41+
resolvedRanges, unresolvedRanges, _ := conversion.GitVersionsToCommits(ranges, repos, metrics, repoTagsCache)
42+
if len(resolvedRanges) == 0 {
43+
metrics.AddNote("Failed to convert git versions to commits")
4644
} else {
4745
gotVersions = true
4846
}
@@ -68,9 +66,9 @@ func (d *DefaultVersionExtractor) ExtractVersions(cve models.CVE5, v *vulns.Vuln
6866
versionRanges, _ := cpeVersionExtraction(cve, metrics)
6967

7068
if len(versionRanges) != 0 {
71-
resolvedRanges, unresolvedRanges, err := conversion.GitVersionsToCommits(versionRanges, repos, metrics, repoTagsCache)
72-
if err != nil {
73-
logger.Error("Failed to convert git versions to commits", slog.Any("err", err))
69+
resolvedRanges, unresolvedRanges, _ := conversion.GitVersionsToCommits(versionRanges, repos, metrics, repoTagsCache)
70+
if len(resolvedRanges) == 0 {
71+
metrics.AddNote("Failed to convert git versions to commits")
7472
} else {
7573
gotVersions = true
7674
}
@@ -96,9 +94,9 @@ func (d *DefaultVersionExtractor) ExtractVersions(cve models.CVE5, v *vulns.Vuln
9694
metrics.AddNote("No versions in CPEs so attempting extraction from description")
9795
versionRanges := textVersionExtraction(cve, metrics)
9896
if len(versionRanges) != 0 {
99-
resolvedRanges, unresolvedRanges, err := conversion.GitVersionsToCommits(versionRanges, repos, metrics, repoTagsCache)
100-
if err != nil {
101-
logger.Error("Failed to convert git versions to commits", slog.Any("err", err))
97+
resolvedRanges, unresolvedRanges, _ := conversion.GitVersionsToCommits(versionRanges, repos, metrics, repoTagsCache)
98+
if len(resolvedRanges) == 0 {
99+
metrics.AddNote("Failed to convert git versions to commits")
102100
}
103101

104102
if len(resolvedRanges) > 0 {

0 commit comments

Comments
 (0)