refactor(vulnfeeds): Use OSVSchema Vulnerability structs instead of maintaining a duplicate set #3714
+244
−257
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hogo6002
reviewed
Jul 23, 2025
vulnfeeds/vulns/vulns.go
Outdated
| @@ -168,57 +150,24 @@ type PackageInfo struct { | |||
| Ecosystem string `json:"ecosystem,omitempty" yaml:"ecosystem,omitempty"` | |||
| PURL string `json:"purl,omitempty" yaml:"purl,omitempty"` | |||
| VersionInfo models.VersionInfo `json:"fixed_version,omitempty" yaml:"fixed_version,omitempty"` | |||
| EcosystemSpecific map[string]string `json:"ecosystem_specific,omitempty" yaml:"ecosystem_specific,omitempty"` | |||
| EcosystemSpecific map[string]any `json:"ecosystem_specific,omitempty" yaml:"ecosystem_specific,omitempty"` | |||
There was a problem hiding this comment.
Updated to interface{} to align with go bindings
vulnfeeds/vulns/vulns.go
Outdated
|
|
||
| // No CVSS 3.1, try falling back to CVSS 3.0 if available. | ||
| if bestVectorString == "" { | ||
| for _, metric := range md.CVSSMetricV30 { |
There was a problem hiding this comment.
The code here feels quite repeated for V3.0 and V3.1. I guess we can't really extract it into a separate function without using generics, can we?
There was a problem hiding this comment.
Refactored a bit regardless.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Noticed that we were using an outdated Vulnerability struct in vulns.go. This will update vulnfeeds to use the osvschema go bindings instead, which will keep the fields better up to date.
Also refactored FromCVE to take the specific fields it needs instead of the whole CVE for better modularity.
Sorry for the long PR.