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

support cdx 1.6 #288

Merged
merged 100 commits into from
Sep 14, 2024
Merged

support cdx 1.6 #288

merged 100 commits into from
Sep 14, 2024

Conversation

mtsfoni
Copy link
Contributor

@mtsfoni mtsfoni commented May 5, 2024

No description provided.

mtsfoni and others added 10 commits May 5, 2024 15:00
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
@andreas-hilti
Copy link
Contributor

@mtsfoni Do you have an understanding which features/changes still need to be added to support 1.6 (https://github.com/CycloneDX/specification/releases/tag/1.6)?
From what I can see your changes are mostly related to general revisioning and CBOM.
This means we are missing at least:

  • Attestation
  • Several smaller features (like tags, swhid, etc.)
  • Json and Protobuf tests

@mtsfoni
Copy link
Contributor Author

mtsfoni commented Aug 24, 2024

  • The CBOM part probably still needs adaption for JSON. It seems to be a good idea to start with JSON and add XML after - unfortunately I did it the other way. This will be my next step.

  • Attestation is missing.

  • Smaller Features might or might not be added, needs checking.

  • I added the test. But many tests were generated outputting an empty BOM, so before releasing the round-trip-test have to be reviewed, that in- and output are actually equal. (For example the Attestation tests)

I hope we managed to fix or at least work around the already existing problem enough now. Those quite threw me off, when I started implementing this months ago. Thank you for your help with those!

andreas-hilti and others added 7 commits August 25, 2024 00:14
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
@mtsfoni
Copy link
Contributor Author

mtsfoni commented Aug 25, 2024

@andreas-hilti

On another note, why did you introduce additional fields like CipherSuite.Algorithms_XML?

I think, that was my first attempt to solve the extra nesting level of lists in xml.
It seems to also work with XmlArray/XmlArrayItem - I willl change it.

One issue which fails several of the tests is that Evidence.Identity can now also be an array of EvidenceIdentities.

Looking into that now.

@mtsfoni
Copy link
Contributor Author

mtsfoni commented Aug 25, 2024

Looks like you already fixed Evidence.Identity?

mtsfoni and others added 3 commits August 25, 2024 11:41
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
@andreas-hilti
Copy link
Contributor

Looks like you already fixed Evidence.Identity?

Yes, at least I tried.

mtsfoni and others added 2 commits August 25, 2024 12:04
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
mtsfoni and others added 8 commits September 1, 2024 14:02
Signed-off-by: Michael Tsfoni <80639729+mtsfoni@users.noreply.github.com>
…ization

Fix protobuf serialization of DateTime
Fix protobuf serialization of lifecycle
Fix protobuf serialization of component and service tools
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
Signed-off-by: MTsfoni <mibau89@gmail.com>
Signed-off-by: MTsfoni <mibau89@gmail.com>
Signed-off-by: MTsfoni <mibau89@gmail.com>
mtsfoni and others added 4 commits September 7, 2024 15:01
- move protobuf compatibility level to protobuf serializer
- split up files to be one class per file
Signed-off-by: MTsfoni <mibau89@gmail.com>
mtsfoni and others added 11 commits September 8, 2024 11:26
Add deprecations for component.author and metadata.manufacture
Signed-off-by: MTsfoni <mibau89@gmail.com>
Signed-off-by: MTsfoni <mibau89@gmail.com>
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
Signed-off-by: andreas hilti <69210561+andreas-hilti@users.noreply.github.com>
Fix JSON serialization of Ikev2TransformTypes
@mtsfoni mtsfoni marked this pull request as ready for review September 14, 2024 15:46
@mtsfoni mtsfoni merged commit d1eacc2 into main Sep 14, 2024
10 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.

2 participants