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.

Sign up for GitHub

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

Jump to bottom

process PACKAGE_OF relationship in SPDX files #1337

Merged
merged 5 commits into from
Oct 9, 2023
Merged

process PACKAGE_OF relationship in SPDX files #1337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1304651
process `PACKAGE_OF` relationship in SPDX files
m-brophy Oct 2, 2023
3d704a3
formatting changes
m-brophy Oct 2, 2023
ae0aa28
process `PACKAGE_OF` relationship in SPDX files
m-brophy Oct 2, 2023
b20a6e3
formatting changes
m-brophy Oct 2, 2023
31a123d
add new test for PACKAGE_OF relationship ingestion
m-brophy Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion pkg/ingestor/parser/spdx/parse_spdx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ func (s *spdxParser) GetPredicates(ctx context.Context) *assembler.IngestPredica
if isDependency(rel.Relationship) {
foundId = string(rel.RefA.ElementRefID)
relatedId = string(rel.RefB.ElementRefID)
} else if isDependent(rel.Relationship) {
} else if isDependent(rel.Relationship) || isPackageOf(rel.Relationship) {
pxp928 marked this conversation as resolved.
Show resolved Hide resolved
foundId = string(rel.RefB.ElementRefID)
relatedId = string(rel.RefA.ElementRefID)
} else {
Expand Down Expand Up @@ -426,6 +426,12 @@ func isDependent(rel string) bool {
}[rel]
}

func isPackageOf(rel string) bool {
return map[string]bool{
spdx_common.TypeRelationshipPackageOf: true,
}[rel]
}

func (s *spdxParser) GetIdentities(ctx context.Context) []common.TrustInformation {
return nil
}
Expand Down
93 changes: 93 additions & 0 deletions pkg/ingestor/parser/spdx/parse_spdx_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ func pUrlToPkgDiscardError(pUrl string) *generated.PkgInputSpec {
}

func Test_spdxParser(t *testing.T) {
packageOfns := "spdx"
//packageOfVersion := "sha256:a743268cd3c56f921f3fb706c"
depPackageOfVersion := "sha256:a743268cd3c56f921f3fb706cc0425c8ab78119fd433e38bb7c5dcd5635b0d10"
packageOfEmptyString := ""
ctx := logging.WithLogger(context.Background())
tests := []struct {
name string
Expand All @@ -63,6 +67,95 @@ func Test_spdxParser(t *testing.T) {
wantPredicates: &testdata.SpdxIngestionPredicates,
wantErr: false,
},
{
name: "SPDX with PACKAGE_OF relationship populates pUrl from described element",
additionalOpts: []cmp.Option{
cmpopts.IgnoreFields(assembler.HasSBOMIngest{},
"HasSBOM"),
},
doc: &processor.Document{
Blob: []byte(`
{
"spdxVersion": "SPDX-2.3",
"SPDXID":"SPDXRef-DOCUMENT",
"name":"sbom-sha256:a743268cd3c56f921f3fb706cc0425c8ab78119fd433e38bb7c5dcd5635b0d10",
"creationInfo": { "created": "2023-01-01T01:01:01.00Z" },
"packages":[
{
"SPDXID":"SPDXRef-Package-sha256-a743268cd3c56f921f3fb706cc0425c8ab78119fd433e38bb7c5dcd5635b0d10",
"name":"sha256:a743268cd3c56f921f3fb706cc0425c8ab78119fd433e38bb7c5dcd5635b0d10",
"externalRefs":[
{
"referenceCategory":"PACKAGE_MANAGER",
"referenceLocator":"pkg:oci/image@sha256:a743268cd3c56f921f3fb706cc0425c8ab78119fd433e38bb7c5dcd5635b0d10?mediaType=application%2Fvnd.oci.image.manifest.v1%2Bjson",
"referenceType":"purl"
}
]
}
],
"relationships":[
{
"spdxElementId":"SPDXRef-DOCUMENT",
"relationshipType":"PACKAGE_OF",
"relatedSpdxElement":"SPDXRef-Package-sha256-a743268cd3c56f921f3fb706cc0425c8ab78119fd433e38bb7c5dcd5635b0d10"
}
]
}
`),
Format: processor.FormatJSON,
Type: processor.DocumentSPDX,
SourceInformation: processor.SourceInformation{
Collector: "TestCollector",
Source: "TestSource",
},
},
wantPredicates: &assembler.IngestPredicates{
IsDependency: []assembler.IsDependencyIngest{
{
Pkg: &generated.PkgInputSpec{
Type: "guac",
Namespace: &packageOfns,
Name: "sbom-sha256%3Aa743268cd3c56f921f3fb706cc0425c8ab78119fd433e38bb7c5dcd5635b0d10",
Version: &packageOfEmptyString,
Subpath: &packageOfEmptyString,
},
DepPkg: &generated.PkgInputSpec{
Type: "oci",
Namespace: &packageOfEmptyString,
Name: "image",
Version: &depPackageOfVersion,
Qualifiers: []generated.PackageQualifierInputSpec{{Key: "mediatype", Value: "application/vnd.oci.image.manifest.v1+json"}},
Subpath: &packageOfEmptyString,
},
DepPkgMatchFlag: generated.MatchFlags{Pkg: "SPECIFIC_VERSION"},
IsDependency: &generated.IsDependencyInputSpec{
VersionRange: "sha256:a743268cd3c56f921f3fb706cc0425c8ab78119fd433e38bb7c5dcd5635b0d10",
DependencyType: "UNKNOWN",
Justification: "top-level package GUAC heuristic connecting to each file/package",
},
},
},

HasSBOM: []assembler.HasSBOMIngest{
{
Pkg: &generated.PkgInputSpec{
Type: "guac",
Namespace: &packageOfns,
Name: "sbom-sha256%3Aa743268cd3c56f921f3fb706cc0425c8ab78119fd433e38bb7c5dcd5635b0d10",
Version: &packageOfEmptyString,
Subpath: &packageOfEmptyString,
},
HasSBOM: &generated.HasSBOMInputSpec{
Uri: "TestSource",
Algorithm: "sha256",
Digest: "ba096464061993bbbdfc30a26b42cd8beb1bfff301726fe6c58cb45d468c7648",
DownloadLocation: "TestSource",
},
},
},
},
wantErr: false,
},
{
name: "SPDX with DESCRIBES relationship populates pUrl from described element",
additionalOpts: []cmp.Option{
Expand Down