fix: improvements to known CPE index construction #2801
Merged
Conversation
This file contains 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
Previously when building the known CPE index, there was logic to de-duplicate processing based on the normalized CPE name; however, this means a significant number of known CPE's don't get indexed because the first instance of that name didn't have a supported collection url but a later one did. This isn't code that executes at runtime in syft so de-duplicating the processing for performance isn't really necessary here and it doesn't add much to the total runtime anyways Signed-off-by: Weston Steimel <commits@weston.slmail.me>
westonsteimel
force-pushed
the
fix-cpe-indexing
branch
from
c135885 to
508c07d
Compare
westonsteimel
changed the title
Previously the struct definition for CpeItem caused only the last URL reference in the list to be kept and processed for inclusion in the index Signed-off-by: Weston Steimel <commits@weston.slmail.me>
westonsteimel
force-pushed
the
fix-cpe-indexing
branch
from
064627c to
0cf0f56
Compare
| @@ -3,8 +3,8 @@ package main | |||
| type CpeItem struct { | |||
| Name string `xml:"name,attr"` | |||
| Title string `xml:"title"` | |||
| References []struct { | |||
| Reference struct { | |||
| References struct { | |||
There was a problem hiding this comment.
@westonsteimel can you help me understand this change?
Why is it more correct to model references as a struct holding a slice of structs than just as a slice of structs?
There was a problem hiding this comment.
With the previous struct definition we only got a single url (the final one from the list) after unmarshalling. If there is a better way to do this, I'm happy to update this, but the go xml unmarshalling examples I found all seemed to show this was the way to make it work
willmurphyscode
approved these changes
Apr 23, 2024
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Previously when building the known CPE index, there was logic to de-duplicate processing based on the normalized CPE name; however, this means a significant number of known CPE's don't get indexed because the first instance of that name didn't have a supported collection url but a later one did. This isn't code that executes at runtime in syft so de-duplicating the processing for performance isn't really necessary here and it doesn't add much to the total runtime anyways
There was also a bug with the struct definition that caused only the final reference url in the list to be unmarshaled and considered when constructing the index