Skip to content

fix(vulnfeeds): descriptions using 'en-US' instead of 'en' weren't parsing #5621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jess-lowe merged 2 commits into from
Jul 13, 2026
+7 −1
Merged

fix(vulnfeeds): descriptions using 'en-US' instead of 'en' weren't parsing #5621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5bf05b
fix bug where descriptions using 'en-US' instead of 'en' are not gett…
jess-lowe Jul 10, 2026
5053d75
fix lint
jess-lowe Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions vulnfeeds/cmd/combine-to-osv/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion vulnfeeds/models/cve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Loading