Skip to content

Add fix date processing for OSV transformers #649

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
merged 2 commits into from
Aug 29, 2025
+115 −8
Merged

Add fix date processing for OSV transformers #649

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
20c94d6
add fix date processing for osv transformers
wagoodman Aug 24, 2025
d735a36
fix linting
wagoodman Aug 29, 2025
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
18 changes: 17 additions & 1 deletion pkg/process/v6/transformers/osv/test-fixtures/BIT-node-2020-8201.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,23 @@
{
"fixed": "14.11.0"
}
]
],
"database_specific": {
"anchore": {
"fixes": [
{
"version": "12.18.4",
"date": "2020-09-15",
"kind": "first-observed"
},
{
"version": "14.11.0",
"date": "2020-09-15",
"kind": "first-observed"
}
]
}
}
}
]
}
Expand Down
43 changes: 40 additions & 3 deletions pkg/process/v6/transformers/osv/transform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ func getAffectedPackages(vuln unmarshal.OSVVulnerability) []grypeDB.AffectedPack
// }
//
// ]
func getGrypeRangesFromRange(r models.Range) []grypeDB.AffectedRange {
func getGrypeRangesFromRange(r models.Range) []grypeDB.AffectedRange { // nolint: gocognit
var ranges []grypeDB.AffectedRange
if len(r.Events) == 0 {
return nil
Expand All @@ -154,6 +154,36 @@ func getGrypeRangesFromRange(r models.Range) []grypeDB.AffectedRange {
}
}

fixByVersion := make(map[string]grypeDB.FixAvailability)
// check r.DatabaseSpecific for "anchore" key which has
// {"fixes": [{
// "version": "v1.2.3",
// "date": "YYYY-MM-DD",
// "kind": "first-observed",
// }]}

if dbSpecific, ok := r.DatabaseSpecific["anchore"]; ok {
if anchoreInfo, ok := dbSpecific.(map[string]any); ok {
if fixes, ok := anchoreInfo["fixes"]; ok {
if fixList, ok := fixes.([]any); ok {
for _, fixEntry := range fixList {
if fixMap, ok := fixEntry.(map[string]any); ok {
version, vOk := fixMap["version"].(string)
kind, kOk := fixMap["kind"].(string)
date, dOk := fixMap["date"].(string)
if vOk && kOk && dOk {
fixByVersion[version] = grypeDB.FixAvailability{
Date: internal.ParseTime(date),
Kind: kind,
}
}
}
}
}
}
}
}

rangeType := normalizeRangeType(r.Type)
for _, e := range r.Events {
switch {
Expand All @@ -171,9 +201,15 @@ func getGrypeRangesFromRange(r models.Range) []grypeDB.AffectedRange {
// Reset the constraint
constraint = ""
case e.Fixed != "":
var detail *grypeDB.FixDetail
if f, ok := fixByVersion[e.Fixed]; ok {
detail = &grypeDB.FixDetail{
Available: &f,
}
}
updateConstraint(fmt.Sprintf("< %s", e.Fixed))
ranges = append(ranges, grypeDB.AffectedRange{
Fix: normalizeFix(e.Fixed),
Fix: normalizeFix(e.Fixed, detail),
Version: grypeDB.AffectedVersion{
Type: rangeType,
Constraint: normalizeConstraint(constraint, rangeType),
Expand Down Expand Up @@ -204,7 +240,7 @@ func normalizeConstraint(constraint string, rangeType string) string {
return constraint
}

func normalizeFix(fix string) *grypeDB.Fix {
func normalizeFix(fix string, detail *grypeDB.FixDetail) *grypeDB.Fix {
fixedInVersion := common.CleanFixedInVersion(fix)
fixState := grypeDB.NotFixedStatus
if len(fixedInVersion) > 0 {
Expand All @@ -214,6 +250,7 @@ func normalizeFix(fix string) *grypeDB.Fix {
return &grypeDB.Fix{
State: fixState,
Version: fixedInVersion,
Detail: detail,
}
}

Expand Down
62 changes: 58 additions & 4 deletions pkg/process/v6/transformers/osv/transform_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ func expectedProvider() *grypeDB.Provider {
}
}

func timeRef(t time.Time) *time.Time {
return &t
}

func loadFixture(t *testing.T, fixturePath string) []unmarshal.OSVVulnerability {
t.Helper()

Expand Down Expand Up @@ -79,8 +83,8 @@ func TestTransform(t *testing.T) {
Status: grypeDB.VulnerabilityActive,
ProviderID: "osv",
Provider: expectedProvider(),
ModifiedDate: &[]time.Time{time.Date(2025, time.January, 17, 15, 26, 01, 971000000, time.UTC)}[0],
PublishedDate: &[]time.Time{time.Date(2024, time.March, 6, 10, 57, 57, 770000000, time.UTC)}[0],
ModifiedDate: timeRef(time.Date(2025, time.January, 17, 15, 26, 01, 971000000, time.UTC)),
PublishedDate: timeRef(time.Date(2024, time.March, 6, 10, 57, 57, 770000000, time.UTC)),
BlobValue: &grypeDB.VulnerabilityBlob{
ID: "BIT-apache-2020-11984",
Description: "Apache HTTP server 2.4.32 to 2.4.44 mod_proxy_uwsgi info disclosure and possible RCE",
Expand Down Expand Up @@ -129,8 +133,8 @@ func TestTransform(t *testing.T) {
Status: grypeDB.VulnerabilityActive,
ProviderID: "osv",
Provider: expectedProvider(),
ModifiedDate: &[]time.Time{time.Date(2024, time.March, 6, 11, 25, 28, 861000000, time.UTC)}[0],
PublishedDate: &[]time.Time{time.Date(2024, time.March, 6, 11, 8, 9, 371000000, time.UTC)}[0],
ModifiedDate: timeRef(time.Date(2024, time.March, 6, 11, 25, 28, 861000000, time.UTC)),
PublishedDate: timeRef(time.Date(2024, time.March, 6, 11, 8, 9, 371000000, time.UTC)),
BlobValue: &grypeDB.VulnerabilityBlob{
ID: "BIT-node-2020-8201",
Description: "Node.js < 12.18.4 and < 14.11 can be exploited to perform HTTP desync attacks and deliver malicious payloads to unsuspecting users. The payloads can be crafted by an attacker to hijack user sessions, poison cookies, perform clickjacking, and a multitude of other attacks depending on the architecture of the underlying system. The attack was possible due to a bug in processing of carrier-return symbols in the HTTP header names.",
Expand Down Expand Up @@ -167,6 +171,12 @@ func TestTransform(t *testing.T) {
Fix: &grypeDB.Fix{
Version: "12.18.4",
State: grypeDB.FixedStatus,
Detail: &grypeDB.FixDetail{
Available: &grypeDB.FixAvailability{
Date: timeRef(time.Date(2020, time.September, 15, 0, 0, 0, 0, time.UTC)),
Kind: "first-observed",
},
},
},
}, {
Version: grypeDB.AffectedVersion{
Expand All @@ -176,6 +186,12 @@ func TestTransform(t *testing.T) {
Fix: &grypeDB.Fix{
Version: "14.11.0",
State: grypeDB.FixedStatus,
Detail: &grypeDB.FixDetail{
Available: &grypeDB.FixAvailability{
Date: timeRef(time.Date(2020, time.September, 15, 0, 0, 0, 0, time.UTC)),
Kind: "first-observed",
},
},
},
}},
},
Expand Down Expand Up @@ -318,6 +334,44 @@ func Test_getGrypeRangesFromRange(t *testing.T) {
},
},
},
{
name: "single range with database-specific fix availability",
rnge: models.Range{
Type: models.RangeSemVer,
Events: []models.Event{{
Introduced: "1.0.0",
}, {
Fixed: "1.2.3",
}},
DatabaseSpecific: map[string]interface{}{
"anchore": map[string]interface{}{
"fixes": []interface{}{
map[string]interface{}{
"version": "1.2.3",
"date": "2023-06-15",
"kind": "first-observed",
},
},
},
},
},
want: []grypeDB.AffectedRange{{
Version: grypeDB.AffectedVersion{
Type: "semver",
Constraint: ">=1.0.0,<1.2.3",
},
Fix: &grypeDB.Fix{
Version: "1.2.3",
State: grypeDB.FixedStatus,
Detail: &grypeDB.FixDetail{
Available: &grypeDB.FixAvailability{
Date: timeRef(time.Date(2023, time.June, 15, 0, 0, 0, 0, time.UTC)),
Kind: "first-observed",
},
},
},
}},
},
}
t.Parallel()
for _, testToRun := range tests {
Expand Down