-
-
Notifications
You must be signed in to change notification settings - Fork 66
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
feat: Add support for TLP marking in metadata (fixes #595) #604
Open
anthonyharrison
wants to merge
11
commits into
CycloneDX:1.7-dev
Choose a base branch
from
anthonyharrison:1.7-dev
base: 1.7-dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
1962322
feat: Add support for TLP marking in metadata (fixes #595)
anthonyharrison 925f5f9
feat: Add support for TLP marking in metadata (fixes #595)
anthonyharrison 55425e5
feat: Add support for TLP marking in metadata - fix protobuf enum (fi…
anthonyharrison d3d243f
feat: Add support for TLP marking in metadata - add default values an…
anthonyharrison 5708d61
`TLP_CLEAR_UNSPECIFIED` -> `TLP_CLEAR`
jkowalleck 98d888d
fixed schema and docs
jkowalleck dbd3c43
tests: fix examples
jkowalleck 636eb43
style fixes
jkowalleck 3da8e47
feat: Add support for TLP marking in metadata - correct TLP descripti…
anthonyharrison 4e918f8
Merge remote-tracking branch 'refs/remotes/origin/1.7-dev' into 1.7-dev
anthonyharrison ed5fa84
feat: Add support for TLP marking in metadata - correct TLP descripti…
anthonyharrison File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
tools/src/test/resources/1.7/invalid-metadata-distribution-1.7.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ | ||
"$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json", | ||
"bomFormat": "CycloneDX", | ||
"specVersion": "1.7", | ||
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", | ||
"version": 1, | ||
"metadata": { | ||
"distribution": "Unrestricted" | ||
}, | ||
"components": [] | ||
} |
7 changes: 7 additions & 0 deletions
7
tools/src/test/resources/1.7/invalid-metadata-distribution-1.7.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<?xml version="1.0"?> | ||
<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7"> | ||
<metadata> | ||
<distribution>Unrestricted</distribution> | ||
</metadata> | ||
<components /> | ||
</bom> |
11 changes: 11 additions & 0 deletions
11
tools/src/test/resources/1.7/valid-metadata-distribution-1.7.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ | ||
"$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json", | ||
"bomFormat": "CycloneDX", | ||
"specVersion": "1.7", | ||
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79", | ||
"version": 1, | ||
"metadata": { | ||
"distribution": "CLEAR" | ||
}, | ||
"components": [] | ||
} |
9 changes: 9 additions & 0 deletions
9
tools/src/test/resources/1.7/valid-metadata-distribution-1.7.textproto
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# proto-file: schema/bom-1.7.proto | ||
# proto-message: Bom | ||
|
||
spec_version: "1.7" | ||
version: 1 | ||
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" | ||
metadata { | ||
distribution: CLEAR | ||
jkowalleck marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} |
7 changes: 7 additions & 0 deletions
7
tools/src/test/resources/1.7/valid-metadata-distribution-1.7.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<?xml version="1.0"?> | ||
<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7"> | ||
<metadata> | ||
<distribution>CLEAR</distribution> | ||
</metadata> | ||
<components /> | ||
</bom> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wait what? was the original ticket not about the distribution of the BOM?
why is it now about the distribution of the component???
if this was really about the distribution of the component that the BOM describes,
than the appropriate field would not be
$.metadata.someshting
but$.metadata.component.something
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@anthonyharrison could you revisit this annotation?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jkowalleck I was using the term component to mean SBOM, HBOM, etc and not a software component. Is there a recommended way of saying this as the TLP applies to all types of BOM?
My proposed change would be 'The Traffic Light Protocol (TLP) classification that controls the sharing and distribution of the BOM'
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe use
PS: eventually there will be a community review phase (RFC), so somebody else might have additional ideas how to phase things better.