Add SPDX generation using spdx-tools #1233

armintaenzertng · 2023-06-23T06:53:27Z

This is set up to produce the same SPDX output as the current spdx generation module while utilising the spdx-tools library. The goal is to replace the current module with this new one, which will allow easy migration to more SPDX formats as well as SPDXv3.
I tried to stay close to the structure of the original implementation.

I tested this using the following commands:
tern report -i golang:1.12-alpine -f spdxjson -o spdx_test.json
and
tern report -i golang:1.12-alpine -f spdxjson_new -o new_spdx_test.json
I compared the resulting json files using jd, treating arrays as unordered sets. The only differences were in timestamps, UUIDs, and two differences in how json output is generated:

The enum value in spdx-tools is PACKAGE_MANAGER, not PACKAGE-MANAGER
The optional key documentDescribes has been deprecated and is therefore not used by the spdx-tools. Only the corresponding DESCRIBES relationship is serialized.

fholger · 2023-06-23T08:49:12Z

tern/formats/spdx_new/constants.py

+    'report-{version}-{image}-{uuid}'
+LICENSE_LIST_VERSION = Version(3, 20)
+CREATOR_NAME = 'tern-{version}'
+DOCUMENT_NAME_SNAPSHOT = 'Tern SPDX JSON SBoM'  # TODO: different name here that is not specific to JSON


Perhaps just drop the JSON from the name?

small nit: SBoM should be SBOM

tern/formats/spdx_new/file_helpers.py

armintaenzertng · 2023-06-23T12:02:22Z

I added support for YAML, XML and RDF-XML formats.

rnjudge · 2023-07-10T21:17:13Z

@armintaenzertng Thank you very much for all your work on this! How does one denote which version of SPDX documents they want using this PR? I am assuming this PR, by default, generates SPDX 2.3 documents. However, we can't drop support for SPDX 2.2 since we have users who want it because it is the ISO standard version. There needs to be a way to denote SPDX version to generate on the command line before we can merge this.

armintaenzertng · 2023-07-11T07:31:27Z

This PR currently replicates the behavior of the current state. That is, SPDX 2.2 is hardcoded into the output.
I will gladly add support for multiple SPDX versions, but we should clarify how this would work in the current workflow.

Should there be an optional parameter that denotes the SPDX version (that gets ignored if no SPDX output is required)? If yes, how do we call that?
Or will we add two (and more in the future) parameters for the -f flag, like spdxjson2.2, spdxjson2.3, spdxjson3.0 etc.? This is probably easier to implement, but will lead to much code duplication, probably not the best idea.

armintaenzertng · 2023-07-11T13:44:29Z

After some further consideration and having a deeper look at the code, point 2 from above might be the better alternative after all. I'll try to implement that.

armintaenzertng · 2023-07-11T15:55:12Z

I added the versioning I described above.
@rnjudge, please have a look if that is OK with you. :)

rnjudge · 2023-07-11T16:09:29Z

@armintaenzertng do you want to schedule a zoom call about this? I would like to avoid mass code duplication as that was the whole point of using the SPDX tools library.

armintaenzertng · 2023-07-11T16:23:02Z

Yes, certainly! :)
Do you have my email address?

armintaenzertng · 2023-07-13T14:26:09Z

I added a CLI version parameter for the output format. Formats that don't support this (i.e. everything except for SPDX) will raise an error if this is set.

tern/formats/cyclonedx/cyclonedxjson/generator.py

tern/formats/spdx_new/package_helpers.py

tern/formats/spdx_new/make_spdx_model.py

armintaenzertng · 2023-07-17T07:27:14Z

I added SPDX-2.3 functionality.

In particular, this means that if the SPDX version is 2.3, we set the primary_package_purpose of the container package to CONTAINER and omit concluded license, declared license and copyright text in SpdxPackages if possible.

rnjudge · 2023-07-17T23:33:26Z

tern/__main__.py

@@ -216,6 +216,9 @@ def main():
                               "available formats: "
                               "spdxtagvalue, spdxjson, cyclonedxjson, json, "
                               "yaml, html")
+    parser_report.add_argument('-fv', '--format-version',


since this is only for SPDX, suggest making that more clear in the wording. Maybe -sv for spdx-version? Also clarify in the help that it is only for the SPDX version and will otherwise be ignored.

Also probably want to indicate what the valid input is since 3.3 is not supported yet and also what it defaults to (2.2) if not specified.

Done, thanks for the input! :)

This is set up to produce the same output as the current spdx generation module while utilising the spdx-tools library. The goal is to replace the current module with this new one, which will allow easy migration to more SPDX formats as well as SPDXv3. Signed-off-by: Armin Tänzer <[email protected]>

This adds support for the other three SPDX formats: XML, YAML and RDF-XML Signed-off-by: Armin Tänzer <[email protected]>

This is to ensure that both the new and old versions of the SPDX writers satisfy the same tests. This uses an Image instance that was generated during the call of "tern report -i golang:1.12-alpine" Signed-off-by: Armin Tänzer <[email protected]>

This adds new options to the -f parameter like "spdxjson22", "spdxjson23", "spdxrdf22" etc. Also extracts common code from the generators of all the different formats. Signed-off-by: Armin Tänzer <[email protected]>

This adds new a new -fv option to specify the version of the output format if it supports versions. Removes the old SPDX version handling. Signed-off-by: Armin Tänzer <[email protected]>

was blindly copied from the previous implementation without updating the year Signed-off-by: Armin Tänzer <[email protected]>

this ensures compatibility with scancode Signed-off-by: Armin Tänzer <[email protected]>

If spdx_version==2.3, set container package primary package purpose to CONTAINER and omit concluded license, declared license and copyright text in SpdxPackages if possible Signed-off-by: Armin Tänzer <[email protected]>

These functions have been adapted from the previous implementation and have not been renamed so far. Signed-off-by: Armin Tänzer <[email protected]>

this fixes validation issues in the spdx-tools Signed-off-by: Armin Tänzer <[email protected]>

armintaenzertng · 2023-07-20T09:12:23Z

@rnjudge: tern report -i photon:3.0 -f spdxjson -sv 2.3 -o output.json followed by pyspdxtools -i output.json yields no errors or invalidations, so I'll mark this "Ready for review" now.
There are still some open issues regarding Spdx documents with file information, which I collected in #1240. As these existed in the old SPDX implementation already, I'd propose to fix them in a separate PR after this one to keep things clearer (this one is already quite large).

vargenau · 2023-07-20T10:46:23Z

This would fix #1211

vargenau · 2023-07-20T10:58:37Z

@rnjudge @armintaenzertng
For specifying the SPDX version of the output, I would propose the following:

tern report -f [email protected] -i golang:1.12-alpine -o alpine.spdx

and

tern report -f [email protected] -i golang:1.12-alpine -o alpine.spdx.json

Advantages would be that we have one less argument and it is similar to the Syft syntax:
https://github.com/anchore/syft/

spdx-tag-value: A tag-value formatted report conforming to the SPDX 2.3 specification
[email protected]: A tag-value formatted report conforming to the SPDX 2.2 specification
spdx-json: A JSON report conforming to the SPDX 2.3 JSON Schema
[email protected]: A JSON report conforming to the SPDX 2.2 JSON Schema

That is what I had prototyped in #1228

What do you think?

armintaenzertng · 2023-07-26T09:00:48Z

@vargenau: I believe the current implementation suggestion is a little more flexible in supporting more versions/formats in the future. Your proposed solution would result in five additional entrypoints (one per spdx format) per version.

Still, if necessary, the [email protected] usecase can be easily implemented by adding a new entrypoint with the generator just calling get_spdx_from_image_list with the right parameters.

vargenau · 2023-07-26T10:48:37Z

Hi @armintaenzertng
My proposal aim was:

to have one less option
to have a syntax similar to Syft
If it is more complex to implement, no problem.

vargenau · 2023-07-26T10:52:18Z

@rnjudge: tern report -i photon:3.0 -f spdxjson -sv 2.3 -o output.json followed by pyspdxtools -i output.json yields no errors or invalidations, so I'll mark this "Ready for review" now. There are still some open issues regarding Spdx documents with file information, which I collected in #1240. As these existed in the old SPDX implementation already, I'd propose to fix them in a separate PR after this one to keep things clearer (this one is already quite large).

Is is really -sv 2.3 ?
In Rose message above, it was parser_report.add_argument('-fv', '--format-version',

armintaenzertng · 2023-07-26T10:58:38Z

I meant -sv, this was changed according to this comment.

vargenau · 2023-07-26T11:00:14Z

I meant -sv, this was changed according to this comment.

Thank you, I had missed that comment.

rnjudge · 2023-07-26T23:39:52Z

ci/test_files_touched.py

-        'tern report -f spdxjson -i photon:3.0 -o spdx.json && ' \
-        'java -jar tools-java/target/tools-java-*-jar-with-dependencies.jar '\
-        'Verify spdx.json'],
+        'tern report -f spdxjson -i photon:3.0 -o spdx.json && '


@armintaenzertng Do these lines need the continuation like the lines that were removed?

The continuation lines were not required in the old code, so I removed them in the new one.
See for example here.

setup.cfg

rnjudge · 2023-07-27T15:26:56Z

setup.cfg

+    spdxrdf = tern.formats.spdx.spdxrdf.generator:SpdxRDF
+    spdxtagvalue = tern.formats.spdx.spdxtagvalue.generator:SpdxTagValue
+    spdxtagvalue_legacy = tern.formats.spdx_legacy.spdxtagvalue.generator:SpdxTagValue
+    spdxjson_legacy = tern.formats.spdx_legacy.spdxjson.generator:SpdxJSON


I will look into this today... but I think we may need to rename the SpdxJSON class here to SpdxJSONLegacy in the actual file at tern/formats/spdx_legacy/spdxjson/generator.py. Same with the SpdxTagValue class in the legacy code.

Why do you say that?
I just tried running tern report -f spdxjson_legacy -i photon:3.0 and it worked without errors for me.

We can of course rename them to make it clearer that this code will be deprecated.

rnjudge · 2023-07-27T15:27:31Z

tern/formats/default/generator.py

@@ -154,8 +157,11 @@ def generate(self, image_obj_list, print_inclusive=False):
            return report
        return report + print_licenses_only(image_obj_list)

-    def generate_layer(self, layer):
+    def generate_layer(self, layer, version: str):


is the version reference here spdx_version? May want to update to spdx_version for clarity and consistency. There are lots of versions throughout the code and without clarity it may seem like this is referring to layer version.

Good catch, that was an oversight!

rnjudge · 2023-07-27T15:28:39Z

tern/formats/html/generator.py

        report_dict = get_report_dict(image_obj_list)
        report = create_html_report(report_dict, image_obj_list)
        return report

-    def generate_layer(self, layer):
+    def generate_layer(self, layer, version: str):


Same comment as above. Update to spdx_version.

armintaenzertng · 2023-08-24T13:43:23Z

Small update: I changed the spdx-tools dependency to the new 0.8.1 version.

-file types are now correctly initialized -license_concluded and copyright_text are omitted when spdx_version == "2.2" Signed-off-by: Armin Tänzer <[email protected]>

Some file info from tern does not come with SHA1 checksums. This is invalid and SPDX documents can't be built without them. This adds a workaround that resorts to the empty string SHA1 in the case that a file doesn't have a checksum. Signed-off-by: Armin Tänzer <[email protected]>

The test and test data were mainly meant for easier debugging, not for full testing purposes. Signed-off-by: Armin Tänzer <[email protected]>

this uses the official release now Signed-off-by: Armin Tänzer <[email protected]>

this was only implemented for spdxjson so far Signed-off-by: Armin Tänzer <[email protected]>

- lazy % formatting in log strings - imports only on top-level - suppress unused argument warning in legacy code Signed-off-by: Armin Tänzer <[email protected]>

all tern entrypoints should be tested, even if they share most of the code Signed-off-by: Armin Tänzer <[email protected]>

…functions This was an oversight in a previous commit. Signed-off-by: Armin Tänzer <[email protected]>

Main feature of that update is much faster validation of large SBOMs, so that validation via spdx-tools becomes viable. Signed-off-by: Armin Tänzer <[email protected]>

armintaenzertng · 2023-08-29T07:16:23Z

small fix: I changed the check for the SPDX version to use the official string "SPDX-2.2" consistently.

armintaenzertng force-pushed the add_spdx_tools branch from ce04e78 to 6902c15 Compare June 23, 2023 07:34

fholger reviewed Jun 23, 2023

View reviewed changes

armintaenzertng force-pushed the add_spdx_tools branch 2 times, most recently from b0f076b to 9f80484 Compare June 28, 2023 05:58

armintaenzertng force-pushed the add_spdx_tools branch from e721ecb to a226cec Compare July 11, 2023 15:53

armintaenzertng force-pushed the add_spdx_tools branch from a226cec to 52ebe3b Compare July 13, 2023 14:24

rnjudge reviewed Jul 13, 2023

View reviewed changes

tern/formats/cyclonedx/cyclonedxjson/generator.py Outdated Show resolved Hide resolved

armintaenzertng force-pushed the add_spdx_tools branch from 52ebe3b to 08811ab Compare July 14, 2023 09:02

rnjudge reviewed Jul 14, 2023

View reviewed changes

tern/formats/spdx_new/package_helpers.py Outdated Show resolved Hide resolved

rnjudge reviewed Jul 14, 2023

View reviewed changes

tern/formats/spdx_new/make_spdx_model.py Outdated Show resolved Hide resolved

armintaenzertng mentioned this pull request Jul 17, 2023

Upgrade spdx-tools to version 0.8 aboutcode-org/scancode-toolkit#3455

Closed

7 tasks

rnjudge reviewed Jul 17, 2023

View reviewed changes

armintaenzertng added 9 commits July 18, 2023 15:35

Add generator plugins for all SPDX formats

9f27150

This adds support for the other three SPDX formats: XML, YAML and RDF-XML Signed-off-by: Armin Tänzer <[email protected]>

add SPDX generation test

d5ed02f

This is to ensure that both the new and old versions of the SPDX writers satisfy the same tests. This uses an Image instance that was generated during the call of "tern report -i golang:1.12-alpine" Signed-off-by: Armin Tänzer <[email protected]>

add SPDX versioning

afdf71a

This adds new options to the -f parameter like "spdxjson22", "spdxjson23", "spdxrdf22" etc. Also extracts common code from the generators of all the different formats. Signed-off-by: Armin Tänzer <[email protected]>

add CLI version parameter

8b21218

This adds new a new -fv option to specify the version of the output format if it supports versions. Removes the old SPDX version handling. Signed-off-by: Armin Tänzer <[email protected]>

update copyright year for new SPDX implementation

aaa3333

was blindly copied from the previous implementation without updating the year Signed-off-by: Armin Tänzer <[email protected]>

update get_purl() according to tern-tools#1237

2350559

this ensures compatibility with scancode Signed-off-by: Armin Tänzer <[email protected]>

add SPDX-2.3 features

b43ac47

If spdx_version==2.3, set container package primary package purpose to CONTAINER and omit concluded license, declared license and copyright text in SpdxPackages if possible Signed-off-by: Armin Tänzer <[email protected]>

rename some SPDX generation functions

dbacd29

These functions have been adapted from the previous implementation and have not been renamed so far. Signed-off-by: Armin Tänzer <[email protected]>

rnjudge mentioned this pull request Jul 19, 2023

Export specific format versions (SPDX) #1228

Closed

upgrade spdx-tools to 0.8.0rc3

dee02f6

this fixes validation issues in the spdx-tools Signed-off-by: Armin Tänzer <[email protected]>

armintaenzertng mentioned this pull request Jul 20, 2023

Invalid file information in SPDX documents #1240

Open

armintaenzertng marked this pull request as ready for review July 20, 2023 09:12

rnjudge reviewed Jul 26, 2023

View reviewed changes

setup.cfg Show resolved Hide resolved

rnjudge reviewed Jul 27, 2023

View reviewed changes

armintaenzertng added 9 commits August 28, 2023 16:23

fix SPDX file handling

ecdc78e

-file types are now correctly initialized -license_concluded and copyright_text are omitted when spdx_version == "2.2" Signed-off-by: Armin Tänzer <[email protected]>

remove temporary SPDX generation test

aedb5a6

The test and test data were mainly meant for easier debugging, not for full testing purposes. Signed-off-by: Armin Tänzer <[email protected]>

upgrade spdx-tools to 0.8.0

22b3edd

this uses the official release now Signed-off-by: Armin Tänzer <[email protected]>

fix default SPDX version value

bc7cd6a

this was only implemented for spdxjson so far Signed-off-by: Armin Tänzer <[email protected]>

fix linting issues

a0cc74e

- lazy % formatting in log strings - imports only on top-level - suppress unused argument warning in legacy code Signed-off-by: Armin Tänzer <[email protected]>

add new SPDX formats to tests

4483794

all tern entrypoints should be tested, even if they share most of the code Signed-off-by: Armin Tänzer <[email protected]>

change version parameter name to spdx_version in some generate_layer …

65d4e00

…functions This was an oversight in a previous commit. Signed-off-by: Armin Tänzer <[email protected]>

update spdx-tools dependency to 0.8.1

b2df558

Main feature of that update is much faster validation of large SBOMs, so that validation via spdx-tools becomes viable. Signed-off-by: Armin Tänzer <[email protected]>

armintaenzertng force-pushed the add_spdx_tools branch from fabf066 to b2df558 Compare August 29, 2023 07:12

rnjudge mentioned this pull request Jan 30, 2024

Support for SPDX 2.3? #1246

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add SPDX generation using spdx-tools #1233

Add SPDX generation using spdx-tools #1233

armintaenzertng commented Jun 23, 2023

fholger Jun 23, 2023

armintaenzertng Jun 23, 2023

rnjudge Jul 10, 2023

armintaenzertng commented Jun 23, 2023

rnjudge commented Jul 10, 2023 •

edited

Loading

armintaenzertng commented Jul 11, 2023

armintaenzertng commented Jul 11, 2023

armintaenzertng commented Jul 11, 2023

rnjudge commented Jul 11, 2023

armintaenzertng commented Jul 11, 2023

armintaenzertng commented Jul 13, 2023

armintaenzertng commented Jul 17, 2023

rnjudge Jul 17, 2023 •

edited

Loading

rnjudge Jul 17, 2023 •

edited

Loading

armintaenzertng Jul 18, 2023

armintaenzertng commented Jul 20, 2023

vargenau commented Jul 20, 2023

vargenau commented Jul 20, 2023

armintaenzertng commented Jul 26, 2023

vargenau commented Jul 26, 2023

vargenau commented Jul 26, 2023

armintaenzertng commented Jul 26, 2023

vargenau commented Jul 26, 2023

rnjudge Jul 26, 2023

armintaenzertng Jul 27, 2023

rnjudge Jul 27, 2023

armintaenzertng Jul 28, 2023

rnjudge Jul 27, 2023 •

edited

Loading

armintaenzertng Jul 28, 2023

armintaenzertng Jul 28, 2023

rnjudge Jul 27, 2023

armintaenzertng Jul 28, 2023

armintaenzertng commented Aug 24, 2023

armintaenzertng commented Aug 29, 2023

Add SPDX generation using spdx-tools #1233

Are you sure you want to change the base?

Add SPDX generation using spdx-tools #1233

Conversation

armintaenzertng commented Jun 23, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

armintaenzertng commented Jun 23, 2023

rnjudge commented Jul 10, 2023 • edited Loading

armintaenzertng commented Jul 11, 2023

armintaenzertng commented Jul 11, 2023

armintaenzertng commented Jul 11, 2023

rnjudge commented Jul 11, 2023

armintaenzertng commented Jul 11, 2023

armintaenzertng commented Jul 13, 2023

armintaenzertng commented Jul 17, 2023

rnjudge Jul 17, 2023 • edited Loading

Choose a reason for hiding this comment

rnjudge Jul 17, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

armintaenzertng commented Jul 20, 2023

vargenau commented Jul 20, 2023

vargenau commented Jul 20, 2023

armintaenzertng commented Jul 26, 2023

vargenau commented Jul 26, 2023

vargenau commented Jul 26, 2023

armintaenzertng commented Jul 26, 2023

vargenau commented Jul 26, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rnjudge Jul 27, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

armintaenzertng commented Aug 24, 2023

armintaenzertng commented Aug 29, 2023

rnjudge commented Jul 10, 2023 •

edited

Loading

rnjudge Jul 17, 2023 •

edited

Loading

rnjudge Jul 17, 2023 •

edited

Loading

rnjudge Jul 27, 2023 •

edited

Loading