diff --git a/vulnfeeds/cmd/combine-to-osv/main.go b/vulnfeeds/cmd/combine-to-osv/main.go index e1c97a81c07..9b7b3080103 100644 --- a/vulnfeeds/cmd/combine-to-osv/main.go +++ b/vulnfeeds/cmd/combine-to-osv/main.go @@ -216,6 +216,12 @@ func combineIntoOSV(cve5osv map[models.CVEID]*osvschema.Vulnerability, nvdosv ma // combineTwoOSVRecords takes two osv records and combines them into one func combineTwoOSVRecords(cve5 *osvschema.Vulnerability, nvd *osvschema.Vulnerability) *osvschema.Vulnerability { baseOSV := cve5 + if baseOSV.GetDetails() == "" && nvd.GetDetails() != "" { + baseOSV.Details = nvd.GetDetails() + } + if baseOSV.GetSummary() == "" && nvd.GetSummary() != "" { + baseOSV.Summary = nvd.GetSummary() + } combinedAffected := pickAffectedInformation(cve5.GetAffected(), nvd.GetAffected()) baseOSV.Affected = combinedAffected diff --git a/vulnfeeds/models/cve.go b/vulnfeeds/models/cve.go index 875896834dd..f2393c004a1 100644 --- a/vulnfeeds/models/cve.go +++ b/vulnfeeds/models/cve.go @@ -146,7 +146,7 @@ type CVE5 struct { func EnglishDescription(descriptions []LangString) string { for _, desc := range descriptions { - if desc.Lang == "en" { + if desc.Lang == "en" || strings.HasPrefix(desc.Lang, "en-") { return desc.Value } }