feat(java): use full path for nested jars #3992
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
DmitriyLewen
commented
Apr 6, 2023
| @@ -105,11 +106,15 @@ func toApplication(fileType, filePath, libFilePath string, r dio.ReadSeekerAt, l | |||
| } | |||
| locs = append(locs, l) | |||
| } | |||
| libPath := libFilePath | |||
| if lib.FilePath != "" { | |||
| libPath = filepath.ToSlash(lib.FilePath) | |||
There was a problem hiding this comment.
We use / in PkgPath when scanning in Windows.
That's why I added ToSlash here.
There was a problem hiding this comment.
Oh, we should have used slashes here. path.Join must be used rather than filepath.Join. The inner separator in ZIP files is always slashed even though it is created on Windows.
4.4.17 file name: (Variable)
4.4.17.1 The name of the file, with optional relative path. The path stored MUST NOT contain a drive or device letter, or a leading slash. All slashes MUST be forward slashes '/' as opposed to backwards slashes '\' for compatibility with Amiga and UNIX file systems etc. If input came from standard input, there is no file name field.
There was a problem hiding this comment.
fixed in 564b68b
DmitriyLewen
requested review from
knqyf263,
AnaisUrlichs and
itaysk
as code owners
knqyf263
reviewed
Apr 24, 2023
| @@ -105,11 +105,15 @@ func toApplication(fileType, filePath, libFilePath string, r dio.ReadSeekerAt, l | |||
| } | |||
| locs = append(locs, l) | |||
| } | |||
| libPath := libFilePath | |||
| if lib.FilePath != "" { | |||
There was a problem hiding this comment.
Can we add a comment?
Suggested change
| if lib.FilePath != "" { | |
| // This file path is populated for virtual file paths within archives, such as nested JAR files. | |
| if lib.FilePath != "" { |
There was a problem hiding this comment.
Added in 98da085
pkg/report/table/vulnerability.go
Outdated
Comment on lines
283
to
290
| firstExtIndex := len(path) | ||
| for _, ext := range jarExtensions { | ||
| i := strings.Index(path, ext) | ||
| if i != -1 && i < firstExtIndex { | ||
| firstExtIndex = i + len(ext) | ||
| } | ||
| } | ||
| return path[:firstExtIndex] |
There was a problem hiding this comment.
I'm afraid of the case where the path /path/to/test.warning/app.jar. It is rare, though.
Suggested change
| firstExtIndex := len(path) | |
| for _, ext := range jarExtensions { | |
| i := strings.Index(path, ext) | |
| if i != -1 && i < firstExtIndex { | |
| firstExtIndex = i + len(ext) | |
| } | |
| } | |
| return path[:firstExtIndex] | |
| // File paths are always forward-slashed in Trivy | |
| paths := strings.Split(path, "/") | |
| for i, p := range paths { | |
| if slices.Contains(jarExtensions, filepath.Ext(p)) { | |
| return strings.Join(paths[:i+1], "/") | |
| } | |
| } | |
| return path |
There was a problem hiding this comment.
Updated in 98da085
knqyf263
approved these changes
Apr 24, 2023
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.
Description
Use full path for nested jars.
The
tableformat still only uses name of root jar.The
jsonformat uses full path.Before:
After:
Related issues
Related PRs
Checklist