jar: support unconventional jar names #1467
Open
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
force-pushed
the
jar-unidentified
branch
5 times, most recently
from
2245436 to
f0d251e
Compare
RTann
requested review from
crozzy and
hdonnay
and removed request for
a team
RTann
force-pushed
the
jar-unidentified
branch
from
f0d251e to
5f47a26
Compare
RTann
force-pushed
the
jar-unidentified
branch
2 times, most recently
from
552f32f to
177a66d
Compare
RTann
force-pushed
the
jar-unidentified
branch
2 times, most recently
from
f8e7fb8 to
7ff485d
Compare
Signed-off-by: RTann <[email protected]>
crozzy
requested changes
Mar 12, 2025
| }, | ||
| } | ||
|
|
||
| if !cmp.Equal(got, want) { |
There was a problem hiding this comment.
Suggested change
| if !cmp.Equal(got, want) { | |
| if !cmp.Equal(got, want, cmpopts.IgnoreFields(Info{}, "SHA")) { |
There was a problem hiding this comment.
This doesn't seem to render correctly as markdown.
| @@ -185,7 +185,7 @@ func (s *Scanner) Scan(ctx context.Context, layer *claircore.Layer) ([]*claircor | |||
| infos, err := jar.Parse(ctx, n, z) | |||
| switch { | |||
| case err == nil: | |||
| case errors.Is(err, jar.ErrUnidentified) || errors.Is(err, jar.ErrNotAJar): | |||
| case errors.Is(err, jar.ErrNotAJar): | |||
| // If there's an error that's one of the "known" reasons (e.g. not a | |||
There was a problem hiding this comment.
nit: This comment could probably be updated to be more specific to ErrNotAJar now
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.
Some JAR files just have bad names 🤷. Claircore should still continue to search for inner JARs in case the found JAR embeds valid JARs. Before this, we just stopped looking through any top-level JAR file with an unconventional name.
When testing, I realized we cannot really tell the difference between JARs and "inner" JARs. I'm wondering if I should also update the package name to be the full path instead of just the final portion. That is:
return
testdata/inner/inner.jar:BOOT-INF/lib/log4j-api-2.14.jar:META-INF/inner-jar/log4j-2.14.0.jarinstead ofMETA-INF/inner-jar/log4j-2.14.0.jar.Also, I realized the packagescanner does not consider a JAR file a valid JAR unless it has a
META-INFdirectory. According to the JAR spec from the last few LTS releases (11, 17, and 21) as well as the latest non-LTS release (23):So, the
META-INFdirectory is not required, so we may want to consider dropping that constraint. Thoughts?