-
-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
incorporate bom link; add test files for components merge
- Loading branch information
Showing
18 changed files
with
1,174 additions
and
18 deletions.
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| package cyclonedx | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net/url" | ||
| "regexp" | ||
| "strconv" | ||
|
|
||
| "github.com/google/uuid" | ||
| ) | ||
|
|
||
| var bomLinkRegex = regexp.MustCompile(`^urn:cdx:(?P<serialNumber>[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\/(?P<version>[0-9]+)(?:#(?P<bomRef>[0-9a-zA-Z\-._~%!$&'()*+,;=:@\/?]+))?$`) | ||
|
|
||
| // IsBOMLink TODO | ||
| func IsBOMLink(s string) bool { | ||
| return bomLinkRegex.MatchString(s) | ||
| } | ||
|
|
||
| // BOMLink TODO | ||
| type BOMLink struct { | ||
| SerialNumber uuid.UUID // Serial number of the linked BOM | ||
| Version int // Version of the linked BOM | ||
| Reference string // Reference of the linked element | ||
| } | ||
|
|
||
| // NewBOMLink TODO | ||
| func NewBOMLink(bom *BOM, elem referrer) (*BOMLink, error) { | ||
| if bom == nil { | ||
| return nil, fmt.Errorf("bom is nil") | ||
| } | ||
| if bom.SerialNumber == "" { | ||
| return nil, fmt.Errorf("missing serial number") | ||
| } | ||
| if bom.Version < 1 { | ||
| return nil, fmt.Errorf("versions below 1 are not allowed") | ||
| } | ||
|
|
||
| serial, err := uuid.Parse(bom.SerialNumber) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("invalid serial number: %w", err) | ||
| } | ||
|
|
||
| if elem == nil { | ||
| return &BOMLink{ | ||
| SerialNumber: serial, | ||
| Version: bom.Version, | ||
| }, nil | ||
| } | ||
|
|
||
| return &BOMLink{ | ||
| SerialNumber: serial, | ||
| Version: bom.Version, | ||
| Reference: elem.bomReference(), | ||
| }, nil | ||
| } | ||
|
|
||
| // String TODO | ||
| func (b BOMLink) String() string { | ||
| if b.Reference == "" { | ||
| return fmt.Sprintf("urn:cdx:%s/%d", b.SerialNumber, b.Version) | ||
| } | ||
|
|
||
| return fmt.Sprintf("urn:cdx:%s/%d#%s", b.SerialNumber, b.Version, url.QueryEscape(b.Reference)) | ||
| } | ||
|
|
||
| // ParseBOMLink TODO | ||
| func ParseBOMLink(s string) (*BOMLink, error) { | ||
| matches := bomLinkRegex.FindStringSubmatch(s) | ||
| if len(matches) < 3 || len(matches) > 4 { | ||
| return nil, fmt.Errorf("") | ||
| } | ||
|
|
||
| serial, err := uuid.Parse(matches[1]) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("invalid serial number: %w", err) | ||
| } | ||
| version, err := strconv.Atoi(matches[2]) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("invalid version: %w", err) | ||
| } | ||
|
|
||
| if len(matches) == 4 { | ||
| bomRef, err := url.QueryUnescape(matches[3]) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("invalid reference: %w", err) | ||
| } | ||
|
|
||
| return &BOMLink{ | ||
| SerialNumber: serial, | ||
| Version: version, | ||
| Reference: bomRef, | ||
| }, nil | ||
| } | ||
|
|
||
| return &BOMLink{ | ||
| SerialNumber: serial, | ||
| Version: version, | ||
| }, nil | ||
| } |
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,15 @@ | ||
| package cyclonedx | ||
|
|
||
| import "testing" | ||
|
|
||
| func TestIsBOMLink(t *testing.T) { | ||
| // TODO | ||
| } | ||
|
|
||
| func TestNewBOMLink(t *testing.T) { | ||
| // TODO | ||
| } | ||
|
|
||
| func TestParseBOMLink(t *testing.T) { | ||
| // TODO | ||
| } |
Oops, something went wrong.