chore: Update v2 to main #1396
Open
chore: Update v2 to main #1396
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
… our osv-scanner.toml in fixtures (google#1337) Uses the new feature landed in google#1214
…ncy resolution (google#1331) Part of google#1330 No functional change is made compared to the version in `internal/manifest`, just switched to use the osv-scalibr interface. Extractors moved to lockfilescalibr as a temporary staging ground before moving to osv-scalibr.
Co-authored-by: Xueqin Cui <[email protected]> Co-authored-by: Michael Kedar <[email protected]>
…#1341) Turns out we don't need most of the functionality of the third party tire library. Built a simple and focused library pathtree which is just a tree with insert and get functions to allow us to implement a virtual filesystem easily.
Add/migrate osv-scanner.json extractor to use the scalibr format. This is intended to replace the current extractor located here: pkg/lockfile/osv-vuln-results.go This is extractor is intended to stay in osv-scanner and not moved to osv-scalibr as it is very osv-scanner specific.
Ideally, node package extracts can be done with packagejson extractor directly (As every dir inside a node_modules directory has a package.json file), but that changes the image scanning snapshots too much to be part of this initial PR, and introduces new OS findings that are difficult to filter out. This keeps the existing solution of extracting directly with node_modules by implementing an extractor that wraps the `packagejsonlock` extractor to minimise snapshot changes.
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Xueqin Cui <[email protected]> Co-authored-by: Michael Kedar <[email protected]> Co-authored-by: Gareth Jones <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Resolves google#1316 Update the --docker flag to: - Only accept one image to scan at a time (to make displaying results easier) - Call new image scanning function internally. - Acts like a convenience function for ``` docker save <image-name> > img-name.tar && osv-scanner --experimental-oci-image=img.name.tar ``` TODO: - [x] Add an ACCEPTANCE test which uses docker to pull down a stable image. - [x] Include a docker pull first, as docker save only saves images already on device and does not pull images online.
This PR contains all the code required to move to osv-scalibr while making the existing code compile and pass all tests (container tests not passing because of a bug in the scalibr alpine extractor). Changes not mentioned in the following list will be split off in separate PRs which should land before this PR. Those are: - [x] google#1337 - [x] google#1331 - [x] google#1338 - [x] google#1341 - [x] google#1345 Changes in this PR: - Fixture changes: - Scalibr Python requirements.txt extractor currently doesn't support packages without versions, so added some version strings to the test files - Image package required quite a bit of reworking to successfully update. - Add the ability to iterate through a directory via the pathtree library - Support scalibr FS interface for Layers - Add conversion code to convert inventories from osv-scalibr back to v1's lockfile and Inventory - This is done to minimize snapshot changes. Followup PRs should remove this conversion - Add `internal/lockfilescalibr` package: - `errors.go` adds common extraction errors we want to translate. - `translation.go` adds helper functions and translation logic between osv-scanner v1 extractor names, and osv-scalibr extractor names. Changes in followup PRs: - Delete lockfiles package and migrate everything to use osv-scalibr extractors - Remove conversion code in image --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Gareth Jones <[email protected]> Co-authored-by: Xueqin Cui <[email protected]> Co-authored-by: Michael Kedar <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Using a separate branch to resolve the merge conflicts, but other than that this is a straightforward update of the v2 branch up to the latest main branch. --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Emmanuel Ferdman <[email protected]> Co-authored-by: Xueqin Cui <[email protected]> Co-authored-by: Michael Kedar <[email protected]> Co-authored-by: Gareth Jones <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Emmanuel Ferdman <[email protected]> Co-authored-by: Ignacio Vazquez <[email protected]>
Follow up to google#1309 BREAKING CHANGE: these packages are no longer public Co-authored-by: Rex P <[email protected]>
Signed-off-by: Holly Gong <[email protected]>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## v2 #1396 +/- ##
==========================================
+ Coverage 68.93% 69.20% +0.27%
==========================================
Files 183 185 +2
Lines 17766 18126 +360
==========================================
+ Hits 12247 12545 +298
- Misses 4840 4894 +54
- Partials 679 687 +8 ☔ View full report in Codecov by Sentry. |
|
These main -> v2 PRs (#1357, #1374) keep including the same commits over and over again, and are accumulating more commits each time. We probably shouldn't be squashing these commits. I think 'Rebase and merge' would be better than 'Create a merge commit', but I'm not too sure. (Though neither of them are enabled on this repo anyway) |
hogo6002
added a commit
that referenced
this pull request
Nov 19, 2024
Refactored the [HTMLResult](https://github.com/google/osv-scanner/blob/9ea8aa57b45890a288a138b600900679ba6c98d1/internal/output/html.go#L19) into a unified structure that can be reused by other output formats. This new structure presents results hierarchically, grouping vulnerabilities by ecosystem, source, and package. Compare to the original vulnerabilityResult, it contains more information, such as vulnerability count (called/uncalled/fixable/unfixable/severity), package/vulnerability fix information, etc. Follow-up PRs: - Merge this into the v2 branch (via #1396) - Leverage this structure to generate a table package-view output. - Update html.go and HTML templates to use the OutputResult.
another-rex
approved these changes
Nov 26, 2024
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.
Using a separate branch to resolve the merge conflicts, but other than that this is a straightforward update of the v2 branch up to the latest main branch.