-
Notifications
You must be signed in to change notification settings - Fork 85
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
jar: support unconventional jar names #1467
base: main
Are you sure you want to change the base?
Conversation
2245436
to
f0d251e
Compare
f0d251e
to
5f47a26
Compare
552f32f
to
177a66d
Compare
f8e7fb8
to
7ff485d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changes look ok to me. Maybe get @crozzy to have another look.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The logic essentially looks good to me, just a few comments on the tests
@crozzy when you re-review can you also let me know your thoughts about the following:
|
For point 1, Yeah I agree it'd be nicer to know from whence the data came and I think that's the intention of PackageDB (at least for the Java indexer). Whether it's another PR or a commit in this PR is up to you. For point 2, I'm trying to judge the balance between making sure we're getting every corner-case / doing excess processing / inflating storage with sub-par/unmatchable data. I think it's probably worth documenting what the spec says, I don't think it warrants changing the current flow (in any case it should be another PR to update that logic). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM in current state, if you adjust the path in the PackageDB
dismiss the review and I'll re-review.
@crozzy I noticed I kept a for loop in the test which set the SHAs to |
@crozzy I also remembered what I was asking about for
so looking at the |
PR to adjust |
Signed-off-by: RTann <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
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.jar
instead 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-INF
directory. 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-INF
directory is not required, so we may want to consider dropping that constraint. Thoughts?