Skip to content

Improve SPDX import by generating generic PURLs when missing #2049

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
Monal-Reddy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve SPDX import by generating generic PURLs when missing #2049

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion scanpipe/pipes/resolve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ def convert_spdx_expression(license_expression_spdx):
def spdx_package_to_package_data(spdx_package):
"""Convert the provided spdx_package into package_data."""
package_url_dict = {}

# Store the original "SPDXID" as package_uid for dependencies resolution.
package_uid = spdx_package.spdx_id

Expand All @@ -322,6 +323,14 @@ def spdx_package_to_package_data(spdx_package):
purl = ref.locator
package_url_dict = PackageURL.from_string(purl).to_dict(encode=True)

if not package_url_dict and spdx_package.name and spdx_package.version:
generic_purl = PackageURL(
type="generic",
name=spdx_package.name,
version=spdx_package.version,
)
package_url_dict = generic_purl.to_dict(encode=True)

checksum_data = {
checksum.algorithm.lower(): checksum.value
for checksum in spdx_package.checksums
Expand All @@ -330,7 +339,9 @@ def spdx_package_to_package_data(spdx_package):
declared_license_expression_spdx = spdx_package.license_concluded
declared_expression = ""
if declared_license_expression_spdx:
declared_expression = convert_spdx_expression(declared_license_expression_spdx)
declared_expression = convert_spdx_expression(
declared_license_expression_spdx
)

package_data = {
"package_uid": package_uid,
Expand Down