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): cyclonedx advisory should omit null value #5041

Merged

Conversation

DmitriyLewen
Copy link
Contributor

@DmitriyLewen DmitriyLewen commented Aug 25, 2023

Description

Explicitly set nil for empty refs slice for Cyclonedx Advisories to avoid

      "id": "CVE-2023-41105",
      ...
      "advisories": null,

This case happens because we use pointer of not nil Object - Type == []cdx.Advisory, Value == nil.

Some simple example - https://go.dev/play/p/M-06dbzzkGB

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

@DmitriyLewen DmitriyLewen changed the title Fix(sbom): cyclonedx advisory must not be null fix(sbom): cyclonedx advisory should not use null value Aug 25, 2023
@DmitriyLewen DmitriyLewen self-assigned this Aug 25, 2023
@DmitriyLewen DmitriyLewen changed the title fix(sbom): cyclonedx advisory should not use null value fix(sbom): cyclonedx advisory should omit null value Aug 25, 2023
@DmitriyLewen DmitriyLewen marked this pull request as ready for review August 28, 2023 03:45
Copy link
Collaborator

@knqyf263 knqyf263 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already have too many tests for CycloneDX. Can we leverage the existing one?

@knqyf263
Copy link
Collaborator

Or we can add a new test just to validate the CycloneDX schema.

@DmitriyLewen
Copy link
Contributor Author

I think for now we can use existing testcase, and also we have validation in integration tests (i added 1 testcase with vulnerabilities to validate vulnerability fields).

I used existing testcase in af908f3

@knqyf263 knqyf263 added this pull request to the merge queue Aug 31, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 31, 2023
@knqyf263 knqyf263 added this pull request to the merge queue Aug 31, 2023
Merged via the queue into aquasecurity:main with commit c04f234 Aug 31, 2023
12 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(cyclonedx): cyclonedx vulnerability advisory == null
2 participants