From c281575348d3f8b455037749435eced5067d2dbc Mon Sep 17 00:00:00 2001 From: Jono Yang Date: Mon, 5 Aug 2024 16:14:40 -0700 Subject: [PATCH] Set license_detections field #518 Signed-off-by: Jono Yang --- minecode/mappers/bower.py | 1 + minecode/mappers/cpan.py | 1 + minecode/mappers/googlecode.py | 2 ++ minecode/mappers/nuget.py | 2 ++ minecode/mappers/openssl.py | 1 + minecode/mappers/packagist.py | 1 + minecode/mappers/sourceforge.py | 1 + minecode/tests/testfiles/bower/expected_28msec_bower.json | 2 ++ .../testfiles/bower/expected_mapper_example1_bower.json | 2 ++ .../tests/testfiles/sourceforge/mapper_odanur_expected.json | 6 +++++- 10 files changed, 18 insertions(+), 1 deletion(-) diff --git a/minecode/mappers/bower.py b/minecode/mappers/bower.py index 5567bf3a..ffc1a8fa 100644 --- a/minecode/mappers/bower.py +++ b/minecode/mappers/bower.py @@ -81,6 +81,7 @@ def build_packages_from_jsonfile(metadata, uri=None, purl=None): keywords=keywords_content, homepage_url=content.get('homepage'), datasource_id='bower_json', + license_detections=[], ) if extracted_license_statement: diff --git a/minecode/mappers/cpan.py b/minecode/mappers/cpan.py index ac25f47a..e8c5e620 100644 --- a/minecode/mappers/cpan.py +++ b/minecode/mappers/cpan.py @@ -57,6 +57,7 @@ def build_packages_from_release_json(metadata, uri=None): version=release.get('version'), download_url=release.get('download_url'), extracted_license_statement=extracted_license_statement, + license_detections=[], # the date format passing is like: # "2014-04-20T21:30:13" release_date=parse_date(release.get('date')), diff --git a/minecode/mappers/googlecode.py b/minecode/mappers/googlecode.py index 16bd8f11..03e09312 100644 --- a/minecode/mappers/googlecode.py +++ b/minecode/mappers/googlecode.py @@ -54,6 +54,7 @@ def build_packages_from_projectsjson_v2(metadata, purl=None, uri=None): license_name = metadata.get('license') if license_name: common_data['extracted_license_statement'] = license_name + common_data['license_detections'] = [] keywords = [] labels = metadata.get('labels') @@ -100,6 +101,7 @@ def build_packages_from_projectsjson_v1(metadata, purl=None, uri=None): license_name = metadata.get('license') if license_name: common_data['extracted_license_statement'] = license_name + common_data['license_detections'] = [] keywords = [] labels = metadata.get('labels') diff --git a/minecode/mappers/nuget.py b/minecode/mappers/nuget.py index e4a8d63d..d939f980 100644 --- a/minecode/mappers/nuget.py +++ b/minecode/mappers/nuget.py @@ -64,6 +64,7 @@ def build_packages_with_json(metadata, purl=None): homepage_url=metadata.get('projectUrl'), description=description, extracted_license_statement=licenseUrl, + license_detections=[], copyright=copyr, parties=authors, keywords=keywords, @@ -168,6 +169,7 @@ def build_packages_from_html(metadata, uri, purl=None): description=description, download_url=download_url, extracted_license_statement=license_value, + license_detections=[], copyright=copyright_value ) package = scan_models.Package.from_package_data( diff --git a/minecode/mappers/openssl.py b/minecode/mappers/openssl.py index 0881e245..fd76ac51 100644 --- a/minecode/mappers/openssl.py +++ b/minecode/mappers/openssl.py @@ -53,6 +53,7 @@ def build_packages(resource_uri, purl=None): size=resource_uri.size, release_date=parse_date(resource_uri.last_modified_date), extracted_license_statement='OpenSSL License', + license_detections=[], homepage_url='https://www.openssl.org/', download_url=uri, copyright='Copyright (c) 1998-2018 The OpenSSL Project\nCopyright (c) 1995-1998 Eric A. Young, Tim J. Hudson\nAll rights reserved.', diff --git a/minecode/mappers/packagist.py b/minecode/mappers/packagist.py index b4713216..3c474c42 100644 --- a/minecode/mappers/packagist.py +++ b/minecode/mappers/packagist.py @@ -77,6 +77,7 @@ def build_packages_with_json(metadata, purl=None, uri=None): extracted_license_statement.add(lic) if extracted_license_statement: common['extracted_license_statement'] = list(extracted_license_statement) + common['license_detections'] = [] dependencies = [] for name, version in version_content.get('require', {}).items(): diff --git a/minecode/mappers/sourceforge.py b/minecode/mappers/sourceforge.py index 48dc8086..8b2b40b0 100644 --- a/minecode/mappers/sourceforge.py +++ b/minecode/mappers/sourceforge.py @@ -51,6 +51,7 @@ def build_packages_from_metafile(metadata, purl=None, uri=None): name=metadata.get('shortname', metadata.get('name')), description=description, homepage_url=metadata.get('external_homepage', metadata.get('url')), + license_detections=[], ) devs = metadata.get('developers') or [] diff --git a/minecode/tests/testfiles/bower/expected_28msec_bower.json b/minecode/tests/testfiles/bower/expected_28msec_bower.json index ad8c0c07..0718ef3d 100644 --- a/minecode/tests/testfiles/bower/expected_28msec_bower.json +++ b/minecode/tests/testfiles/bower/expected_28msec_bower.json @@ -40,6 +40,8 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/bower/expected_mapper_example1_bower.json b/minecode/tests/testfiles/bower/expected_mapper_example1_bower.json index 56a791d8..f74bf0cb 100644 --- a/minecode/tests/testfiles/bower/expected_mapper_example1_bower.json +++ b/minecode/tests/testfiles/bower/expected_mapper_example1_bower.json @@ -74,6 +74,8 @@ "extracted_license_statement":"- NewBSD\n", "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, diff --git a/minecode/tests/testfiles/sourceforge/mapper_odanur_expected.json b/minecode/tests/testfiles/sourceforge/mapper_odanur_expected.json index f00aed6e..5fb55772 100644 --- a/minecode/tests/testfiles/sourceforge/mapper_odanur_expected.json +++ b/minecode/tests/testfiles/sourceforge/mapper_odanur_expected.json @@ -40,12 +40,16 @@ "extracted_license_statement":null, "notice_text":null, "source_packages":[], + "is_private":false, + "is_virtual":false, "extra_data":{}, "repository_homepage_url":null, "repository_download_url":null, "api_data_url":null, "package_uid":"pkg:sourceforge/odanur?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_paths":[], + "datafile_paths":[ + null + ], "datasource_ids":[ "sourceforge_metadata" ],