Add support for processing files with prepended bytes before the zip archive #428
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
Benchmark Test ResultsBenchmark results from the latest changes vs base branch |
luhring
reviewed
Jun 3, 2021
| } | ||
|
|
||
| // OpenZip provides a ZipReadCloser for the given filepath. | ||
| func OpenZip(filepath string) (*ZipReadCloser, error) { |
There was a problem hiding this comment.
nit: Can OpenZip be unexported?
There was a problem hiding this comment.
it can, but we should be opening all zips with this util now (including future uses of zip.OpenReader should use this instead). It happens to be that no other function internally yet.
|
|
||
| t.Logf("running from: %s", cwd) | ||
| // create a temp file | ||
| tmpFile, err := ioutil.TempFile("", "syft-ziputil-archive-TEST-") |
There was a problem hiding this comment.
"syft-ziputil-archive-TEST-" — This string might be worth extracting as a constant, partially for consistency, partially for developer ease as we add tests.
There was a problem hiding this comment.
these should be roughly unique for each test or helper, I'll adjust the name.
alfredodeza
reviewed
Jun 3, 2021
| return startOfArchive, nil | ||
| } | ||
|
|
||
| func findSignatureInBlock(b []byte) int { |
There was a problem hiding this comment.
is this func also derived from the zip package? it looks terrifying
There was a problem hiding this comment.
it is (from the top of the file):
// directoryEndLen, readByf, directoryEnd, and findSignatureInBlock were copied from the golang stdlib, specifically:
// - https://github.com/golang/go/blob/go1.16.4/src/archive/zip/struct.go
// - https://github.com/golang/go/blob/go1.16.4/src/archive/zip/reader.go
// findArchiveStartOffset is derived from the same stdlib utils, specifically the readDirectoryEnd function.
wagoodman
force-pushed
the
self-extracting-jar
branch
from
4047760 to
452e55b
Compare
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
wagoodman
force-pushed
the
self-extracting-jar
branch
from
452e55b to
6a398f9
Compare
luhring
approved these changes
Jun 4, 2021
GijsCalis
pushed a commit
to GijsCalis/syft
that referenced
this pull request
Feb 19, 2024
Add support for processing files with prepended bytes before the zip archive
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.
Today syft unzips java jars and catalogs all contents, however, jars (which are typically zip files) with shell scripts prepended to the archive are not supported by the stdlib. This PR adds support for processing the files as described in the above golang issue + #413 (comment) .
Specifically, this PR adds a new
ZipReadCloserthat is a drop-in replacement for the stdlibzip.ReadCloser, but adds support for the above mentioned case (ignoring prepended bytes).This additionally updates the
TraverseFilesInZiputil function to only use the newZipReadCloser, and in doing so all of the helper functions that useTraverseFilesInZipalso no longer usezip.ReadCloser.The Springboot test-fixture has been updated to generate the self-executing tar which exhibits this behavior (which should be the same kind of jar as described in #413 ).
Closes #413