Skip to content

Commit

Permalink
SBOM cataloger
Browse files Browse the repository at this point in the history
Signed-off-by: Patrik Beno <patrik.beno@greenhorn.sk>
  • Loading branch information
patrikbeno committed Jul 19, 2022
1 parent 9b1adce commit cb10e39
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 0 deletions.
11 changes: 11 additions & 0 deletions internal/formats/common/spdxhelpers/source_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,17 @@ func SourceInfo(p pkg.Package) string {
var paths []string
for _, l := range p.Locations.ToSlice() {
paths = append(paths, l.RealPath)
var sbom = // todo improve this, maybe use sbom cataloger glob parsers
strings.HasSuffix(l.RealPath, ".syft.json") ||
strings.HasSuffix(l.RealPath, "bom.json") ||
strings.HasSuffix(l.RealPath, "bom.xml") ||
strings.HasSuffix(l.RealPath, ".cdx.json") ||
strings.HasSuffix(l.RealPath, ".cdx.xml") ||
strings.HasSuffix(l.RealPath, ".spdx.json") ||
strings.HasSuffix(l.RealPath, ".spdx")
if sbom {
answer = "acquired from SBOM"
}
}

return answer + ": " + strings.Join(paths, ", ")
Expand Down
4 changes: 4 additions & 0 deletions syft/pkg/cataloger/cataloger.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/anchore/syft/syft/pkg/cataloger/ruby"
"github.com/anchore/syft/syft/pkg/cataloger/rust"
"github.com/anchore/syft/syft/pkg/cataloger/swift"
"github.com/anchore/syft/syft/pkg/cataloger/sbom"
"github.com/anchore/syft/syft/source"
)

Expand Down Expand Up @@ -58,6 +59,7 @@ func ImageCatalogers(cfg Config) []Cataloger {
golang.NewGoModuleBinaryCataloger(),
dotnet.NewDotnetDepsCataloger(),
portage.NewPortageCataloger(),
sbom.NewSBOMCataloger(),
}, cfg.Catalogers)
}

Expand All @@ -84,6 +86,7 @@ func DirectoryCatalogers(cfg Config) []Cataloger {
cpp.NewConanfileCataloger(),
portage.NewPortageCataloger(),
haskell.NewHackageCataloger(),
sbom.NewSBOMCataloger(),
}, cfg.Catalogers)
}

Expand Down Expand Up @@ -113,6 +116,7 @@ func AllCatalogers(cfg Config) []Cataloger {
cpp.NewConanfileCataloger(),
portage.NewPortageCataloger(),
haskell.NewHackageCataloger(),
sbom.NewSBOMCataloger(),
}, cfg.Catalogers)
}

Expand Down
70 changes: 70 additions & 0 deletions syft/pkg/cataloger/sbom/cataloger.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
package sbom

import (
"bytes"
"fmt"
"github.com/anchore/syft/internal/formats/cyclonedxjson"
"github.com/anchore/syft/internal/formats/cyclonedxxml"
"github.com/anchore/syft/internal/formats/spdx22json"
"github.com/anchore/syft/internal/formats/spdx22tagvalue"
"github.com/anchore/syft/internal/formats/syftjson"
"github.com/anchore/syft/syft/artifact"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/pkg/cataloger/common"
"github.com/anchore/syft/syft/sbom"
"io"
)

// NewSBOMCataloger returns a new SBOM cataloger object loaded from saved SBOM JSON.
func NewSBOMCataloger() *common.GenericCataloger {
globParsers := map[string]common.ParserFn{
"**/*.syft.json": parseSyftJSON,
"**/bom.json": parseCyclonedxJSON,
"**/bom.xml": parseCyclonedxXML,
"**/*.cdx.json": parseCyclonedxJSON,
"**/*.cdx.xml": parseCyclonedxXML,
"**/*.spdx.json": parseSpdxJSON,
"**/*.spdx": parseSpdx,
}
return common.NewGenericCataloger(nil, globParsers, "sbom-cataloger")
}

func parseSyftJSON(path string, reader io.Reader) ([]*pkg.Package, []artifact.Relationship, error) {
return parseSBOM(path, reader, syftjson.Format())
}

func parseCyclonedxJSON(path string, reader io.Reader) ([]*pkg.Package, []artifact.Relationship, error) {
return parseSBOM(path, reader, cyclonedxjson.Format())
}

func parseCyclonedxXML(path string, reader io.Reader) ([]*pkg.Package, []artifact.Relationship, error) {
return parseSBOM(path, reader, cyclonedxxml.Format())
}

func parseSpdxJSON(path string, reader io.Reader) ([]*pkg.Package, []artifact.Relationship, error) {
return parseSBOM(path, reader, spdx22json.Format())
}

func parseSpdx(path string, reader io.Reader) ([]*pkg.Package, []artifact.Relationship, error) {
return parseSBOM(path, reader, spdx22tagvalue.Format())
}

func parseSBOM(_ string, reader io.Reader, format sbom.Format) ([]*pkg.Package, []artifact.Relationship, error) {
by, err := io.ReadAll(reader)
if err != nil {
return nil, nil, fmt.Errorf("unable to read sbom: %w", err)
}

s, err := format.Decode(bytes.NewReader(by))
if err != nil {
return nil, nil, fmt.Errorf("unable to decode sbom: %w", err)
}

var packages []*pkg.Package
for _, p := range s.Artifacts.PackageCatalog.Sorted() {
x := p // copy
packages = append(packages, &x)
}

return packages, nil, nil
}

0 comments on commit cb10e39

Please sign in to comment.