fix resolution state for packages with modules #937
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
RTann
added
the
generate-dumps-on-pr
RTann
commented
Sep 20, 2022
| @@ -6,7 +6,7 @@ func init() { | |||
| RegisterMigration(migrate.Migration{ | |||
| ID: 19, | |||
| Up: migrate.Queries([]string{ | |||
| `ALTER TABLE vuln_v2 ADD COLUMN IF NOT EXISTS package_resolution_state TEXT NOT NULL DEFAULT ''`, | |||
| `ALTER TABLE vuln_v2 ADD COLUMN IF NOT EXISTS resolution_state TEXT`, | |||
There was a problem hiding this comment.
no need to make this NOT NULL. Also, change the name to something more concise
There was a problem hiding this comment.
One of the tests failed when I was trying to remove "NOT NULL". I am guessing it's because not all package has an resolution state. But it will be great if we can remove that constraint.
There was a problem hiding this comment.
Yeah, there are 1777588 rows in vuln_v2 with empty resolution_state :D . I don't think we need to worry about NOT NULL since Go would turn it into an empty string upon insert and read
| @@ -174,6 +174,7 @@ func md5Vuln(v *database.RHELv2Vulnerability, pkgInfoIdx, pkgIdx, cpeIdx int) [] | |||
| b.WriteString(pkg.Module) | |||
| b.WriteString(pkg.Arch) | |||
| b.WriteString(cpe) | |||
| b.WriteString(pkg.ResolutionState) | |||
There was a problem hiding this comment.
this should be part of the md5 hash
|
Images are ready for the commit at 912aeaf. To use the images, use the tag |
daynewlee
reviewed
Sep 21, 2022
RTann
commented
Sep 22, 2022
RTann
changed the title
daynewlee
approved these changes
Sep 29, 2022
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.
We were originally unsure what something like
maven:3.6/mavenmeant when looking at a package's resolution state, so we ignored anything before the/. It turns out, this indicates the package (maven) plus its module (maven:3.6), so this PR ensures we correctly attribute the resolution state to the correct package/module combo.This PR also includes various related cleaning and a fix for the md5 hash when inserting a vulnerability into the DB