fix: enhance Tag validation to detect schema issues in signedcorim_test #234
+53
−25
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -343,11 +343,55 @@ type Tag struct { | |
| } | ||
|
|
||
| func (o Tag) Valid() error { | ||
| // Check that the tag is not zero-length | ||
| if len(o.Content) == 0 { | ||
| return errors.New("empty tag") | ||
| } | ||
|
|
||
| // Validate the tag content based on the tag number | ||
| switch o.Number { | ||
| case ComidTag: // 506 - CoMID tag | ||
| return o.validateComidTag() | ||
| case CoswidTag: // 505 - CoSWID tag | ||
| return o.validateCoswidTag() | ||
| default: | ||
| // For unknown tags, just ensure the content is valid CBOR | ||
| return o.validateGenericCBOR() | ||
| } | ||
| } | ||
|
|
||
| // validateComidTag validates the content of a CoMID tag (506) | ||
| func (o Tag) validateComidTag() error { | ||
| var c comid.Comid | ||
| if err := dm.Unmarshal(o.Content, &c); err != nil { | ||
| return fmt.Errorf("invalid CoMID content: %w", err) | ||
| } | ||
|
|
||
| if err := c.Valid(); err != nil { | ||
| return fmt.Errorf("CoMID validation failed: %w", err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // validateCoswidTag validates the content of a CoSWID tag (505) | ||
| func (o Tag) validateCoswidTag() error { | ||
| var s swid.SoftwareIdentity | ||
| if err := dm.Unmarshal(o.Content, &s); err != nil { | ||
| return fmt.Errorf("invalid CoSWID content: %w", err) | ||
| } | ||
|
|
||
| // Basic validation - if unmarshaling succeeded, the structure is valid | ||
| // Additional validation could be added here if needed | ||
| return nil | ||
| } | ||
|
|
||
| // validateGenericCBOR validates that content is valid CBOR | ||
| func (o Tag) validateGenericCBOR() error { | ||
| var raw interface{} | ||
| if err := dm.Unmarshal(o.Content, &raw); err != nil { | ||
| return fmt.Errorf("invalid CBOR content: %w", err) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
|
|
||
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.
This test case is supposed to test correct unmarshalling of a valid CoRIM. Rather than changing the expected error to be non-nil, the input needs to be amended with a valide signed CoRIM.
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.
FIX