Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix(fs): handle default skip dirs properly #6628

Merged
merged 2 commits into from
May 4, 2024
Merged

fix(fs): handle default skip dirs properly #6628

merged 2 commits into from
May 4, 2024

Conversation

knqyf263
Copy link
Collaborator

@knqyf263 knqyf263 commented May 4, 2024 •
edited
Loading

Description

There are two problems. First, d.Info() could return an error on system files, like /proc. It is currently called before skipping dirs. File walking exits before processing skipping dirs. Second, user-specified skipping dirs are pre-processed, but the default skipping dirs are also processed by mistake. This PR fixes these two problems.

Related issues

Checklist

  • I've read the guidelines for contributing to this repository.
  • I've followed the conventions in the PR title.
  • I've added tests that prove my fix is effective or that my feature works.
  • I've updated the documentation with the relevant information (if needed).
  • I've added usage information (if the PR introduces new options)
  • I've included a "before" and "after" example to the description (if the PR is a user interface change).

@knqyf263 knqyf263 self-assigned this May 4, 2024
@knqyf263 knqyf263 requested a review from simar7 May 4, 2024 04:12
@knqyf263 knqyf263 marked this pull request as ready for review May 4, 2024 05:02
@knqyf263 knqyf263 added this pull request to the merge queue May 4, 2024
Merged via the queue into aquasecurity:main with commit 8016b82 May 4, 2024
12 checks passed
@knqyf263 knqyf263 deleted the fix/system_dirs branch May 4, 2024 05:56
fl0pp5 pushed a commit to altlinux/trivy that referenced this pull request May 6, 2024
@knqyf263 @fl0pp5
fix(fs): handle default skip dirs properly (aquasecurity#6628)
4fcdcf4 
Signed-off-by: knqyf263 <[email protected]>
@aqua-bot aqua-bot mentioned this pull request May 29, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simar7 simar7 simar7 approved these changes

@DmitriyLewen DmitriyLewen Awaiting requested review from DmitriyLewen

Assignees

@knqyf263 knqyf263

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Trivy 0.51.0 rootfs scan throwing FATAL during vuln scan on root directory
2 participants
@knqyf263 @simar7