Skip to content

fix(debian): don't include empty licenses for dpkgs #8623

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

Merged

Conversation

DmitriyLewen
Copy link
Contributor

@DmitriyLewen DmitriyLewen commented Mar 27, 2025

Description

Don't include empty licenses in report.

Also this PR fixes problem with invalid CycloneDX files:

Before:

➜  trivy -q image --format cyclonedx mcr.microsoft.com/playwright:v1.50.0-noble -o playwright-sbom.json 

➜  cyclonedx validate --input-format json --fail-on-errors --input-version v1_6 --input-file playwright-sbom.json
Validating JSON BOM...
Validation failed:
Expected 1 matching subschema but found 0
...

After:

➜  ./trivy -q image --format cyclonedx mcr.microsoft.com/playwright:v1.50.0-noble -o playwright-sbom.json
➜  cyclonedx validate --input-format json --fail-on-errors --input-version v1_6 --input-file playwright-sbom.json
Validating JSON BOM...
BOM validated successfully.

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).

- skip empty licenses for `License:` pattern
- add test to check this case
@DmitriyLewen DmitriyLewen self-assigned this Mar 27, 2025
@DmitriyLewen DmitriyLewen changed the title fix(dpkg): don't include empty licenses fix(debian): don't include empty licenses for dpkgs Mar 27, 2025
@DmitriyLewen DmitriyLewen requested a review from simar7 March 27, 2025 09:36
@DmitriyLewen DmitriyLewen marked this pull request as ready for review March 27, 2025 09:36
@DmitriyLewen DmitriyLewen requested a review from knqyf263 as a code owner March 27, 2025 09:36
@simar7 simar7 added this pull request to the merge queue Mar 27, 2025
Merged via the queue into aquasecurity:main with commit 346f5b3 Mar 27, 2025
13 of 14 checks passed
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(dpkg): packages may include empty license strings
2 participants