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.

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

fix(sbom): use package UIDs for uniqueness #7042

Merged
merged 5 commits into from
Jun 28, 2024

Conversation

knqyf263
Copy link
Collaborator

Description

The package ID, based on the name and version, is used in some places.

vulns[v.PkgID] = append(vulns[v.PkgID], v)

However, it is not globally unique, as there are cases where the same package is installed in different paths. We should use UIDs for this purpose.

Also, added a process to fill in the UIDs for old JSON reports as they don't contain UIDs, and tests for trivy convert.

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 Jun 27, 2024
@knqyf263 knqyf263 changed the title fix(sbom): use package UID for uniqueness fix(sbom): use package UIDs for uniqueness Jun 27, 2024
@knqyf263 knqyf263 marked this pull request as ready for review June 27, 2024 12:46
@knqyf263 knqyf263 requested a review from DmitriyLewen as a code owner June 27, 2024 12:46
pkg/sbom/io/encode.go Outdated Show resolved Hide resolved
pkg/commands/convert/run.go Outdated Show resolved Hide resolved
knqyf263 added 2 commits June 28, 2024 10:23
Signed-off-by: knqyf263 <[email protected]>
Signed-off-by: knqyf263 <[email protected]>
@knqyf263 knqyf263 added this pull request to the merge queue Jun 28, 2024
Merged via the queue into aquasecurity:main with commit 14d71ba Jun 28, 2024
12 checks passed
@knqyf263 knqyf263 deleted the refactor/pkg_uid branch June 28, 2024 09:14
skahn007gl pushed a commit to skahn007gl/trivy that referenced this pull request Jul 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bug(cyclonedx): Trivy image scan reports and counts the same CVE for the same package multiple times
2 participants