Skip to content

Added CycloneDX License ID Validation Capability For CycloneDX Formatted SBOMs #1250

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Added CycloneDX License ID Validation Capability For CycloneDX Formatted SBOMs #1250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c74d76e
added license processing
Mar 10, 2024
88193b3
using spdx_license_list for invalid license handling
Mar 11, 2024
72437b1
Merge pull request #1 from REestwick/license-processing
REestwick Mar 11, 2024
3ef20ce
added license validation using the cyclonedx-python-lib
Mar 12, 2024
e89d5f2
Merge pull request #2 from REestwick/license-validation-cdx-lib
REestwick Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ GitPython~=3.1
prettytable~=3.8
packageurl-python>=0.11.1
license-expression>=30.1
cyclonedx-python-lib>=5.1.1

10 changes: 7 additions & 3 deletions tern/formats/cyclonedx/cyclonedx_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
import datetime
import uuid
from tern.utils import general


from cyclonedx.spdx import fixup_id as spdx_id_validate
###################
# General Helpers #
###################
Expand Down Expand Up @@ -91,4 +90,9 @@ def get_os_guess(image_obj):


def get_license_from_name(name):
return {'license': {'id': name}}
spdx_id = spdx_id_validate(name)
if spdx_id:
return {'license': {'id': spdx_id}}
else:
return {'license': {'name': name}}