Skip to content

Commit

Permalink
✨ Do not error out on SBOM generation, use the sbom ErrorMessage inst…
Browse files Browse the repository at this point in the history 
…ead (#5202)

* ✨ Do not error out on SBOM generation, use the sbom ErrorMessage instead.

Signed-off-by: Preslav <preslav@mondoo.com>

* Remove NewBom and GenerateBomV2, GenerateBom does not return err anymore.

Signed-off-by: Preslav <preslav@mondoo.com>

---------

Signed-off-by: Preslav <preslav@mondoo.com>
  • Loading branch information
@preslavgerchev
preslavgerchev authored Feb 10, 2025
1 parent 96c265f commit e3c2a46
Show file tree
Hide file tree
Showing 8 changed files with 216 additions and 139 deletions.
5 changes: 1 addition & 4 deletions apps/cnquery/cmd/sbom.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,7 @@ var sbomCmdRun = func(cmd *cobra.Command, runtime *providers.Runtime, cliRes *pl
logger.DebugDumpJSON("mondoo-sbom-report", data)
}

boms, err := generator.NewBom(cnspecReport)
if err != nil {
log.Fatal().Err(err).Msg("failed to parse bom")
}
boms := generator.GenerateBom(cnspecReport)

var exporter sbom.FormatSpecificationHandler
output := viper.GetString("output")
Expand Down
3 changes: 1 addition & 2 deletions sbom/cnquery_bom_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ func TestSimpleBomOutput(t *testing.T) {
report, err := generator.LoadReport("./testdata/alpine.json")
require.NoError(t, err)

sboms, err := generator.GenerateBom(report)
require.NoError(t, err)
sboms := generator.GenerateBom(report)

// store bom in different formats
selectedBom := sboms[0]
Expand Down
3 changes: 1 addition & 2 deletions sbom/cyclonedx_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ func TestCycloneDxOutput(t *testing.T) {
report, err := generator.LoadReport("./testdata/alpine.json")
require.NoError(t, err)

sboms, err := generator.GenerateBom(report)
require.NoError(t, err)
sboms := generator.GenerateBom(report)

// store bom in different formats
selectedBom := sboms[0]
Expand Down
186 changes: 91 additions & 95 deletions sbom/generator/generator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"strings"
"time"

"github.com/pkg/errors"
"go.mondoo.com/cnquery/v11"
"go.mondoo.com/cnquery/v11/cli/reporter"
"go.mondoo.com/cnquery/v11/mrn"
Expand All @@ -17,15 +18,10 @@ import (

var LABEL_KERNEL_RUNNING = "mondoo.com/os/kernel-running"

// NewBom creates a BOM from a cnquery report
func NewBom(report *reporter.Report) ([]*sbom.Sbom, error) {
return GenerateBom(report)
}

// GenerateBom generates a BOM from a cnquery json report collection
func GenerateBom(r *reporter.Report) ([]*sbom.Sbom, error) {
func GenerateBom(r *reporter.Report) []*sbom.Sbom {
if r == nil {
return nil, nil
return nil
}

generator := &sbom.Generator{
Expand All @@ -39,7 +35,6 @@ func GenerateBom(r *reporter.Report) ([]*sbom.Sbom, error) {
boms := []*sbom.Sbom{}
for mrn := range r.Assets {
asset := r.Assets[mrn]

bom := &sbom.Sbom{
Generator: generator,
Timestamp: now,
Expand All @@ -65,82 +60,55 @@ func GenerateBom(r *reporter.Report) ([]*sbom.Sbom, error) {
boms = append(boms, bom)
continue
}
if dataPoints != nil {
for k := range dataPoints.Values {
dataValue := dataPoints.Values[k]
jsondata, err := reporter.JsonValue(dataValue.Content)
if err != nil {
return nil, err
}
rb := BomFields{}
err = json.Unmarshal(jsondata, &rb)
if err != nil {
return nil, err
}
if rb.Asset != nil {
bom.Asset.Name = rb.Asset.Name
bom.Asset.Platform.Name = rb.Asset.Platform
bom.Asset.Platform.Version = rb.Asset.Version
bom.Asset.Platform.Family = rb.Asset.Family
bom.Asset.Platform.Arch = rb.Asset.Arch
bom.Asset.Platform.Cpes = rb.Asset.CPEs
bom.Asset.Platform.Labels = rb.Asset.Labels
bom.Asset.PlatformIds = enrichPlatformIds(rb.Asset.IDs)
}

if bom.Asset == nil {
bom.Asset = &sbom.Asset{}
}
if bom.Asset.Labels == nil {
bom.Asset.Labels = map[string]string{}
}
for _, dataValue := range dataPoints.Values {
jsondata, err := reporter.JsonValue(dataValue.Content)
if err != nil {
bom.Status = sbom.Status_STATUS_FAILED
bom.ErrorMessage = errors.Wrap(err, "failed to parse json data").Error()
break
}
rb := BomFields{}
err = json.Unmarshal(jsondata, &rb)
if err != nil {
bom.Status = sbom.Status_STATUS_FAILED
bom.ErrorMessage = errors.Wrap(err, "failed to parse bom fields json data").Error()
break
}
if rb.Asset != nil {
bom.Asset.Name = rb.Asset.Name
bom.Asset.Platform.Name = rb.Asset.Platform
bom.Asset.Platform.Version = rb.Asset.Version
bom.Asset.Platform.Family = rb.Asset.Family
bom.Asset.Platform.Arch = rb.Asset.Arch
bom.Asset.Platform.Cpes = rb.Asset.CPEs
bom.Asset.Platform.Labels = rb.Asset.Labels
bom.Asset.PlatformIds = enrichPlatformIds(rb.Asset.IDs)
}

// store version of running kernel
for _, kernel := range rb.KernelInstalled {
if kernel.Running {
bom.Asset.Labels[LABEL_KERNEL_RUNNING] = kernel.Version
}
}
if bom.Asset == nil {
bom.Asset = &sbom.Asset{}
}
if bom.Asset.Labels == nil {
bom.Asset.Labels = map[string]string{}
}

if rb.Packages != nil {
for _, pkg := range rb.Packages {
bomPkg := &sbom.Package{
Name: pkg.Name,
Version: pkg.Version,
Architecture: pkg.Arch,
Origin: pkg.Origin,
Purl: pkg.Purl,
Cpes: pkg.CPEs,
Type: pkg.Format,
}

for _, filepath := range pkg.FilePaths {
bomPkg.EvidenceList = append(bomPkg.EvidenceList, &sbom.Evidence{
Type: sbom.EvidenceType_EVIDENCE_TYPE_FILE,
Value: filepath,
})
}

bom.Packages = append(bom.Packages, bomPkg)
}
// store version of running kernel
for _, kernel := range rb.KernelInstalled {
if kernel.Running {
bom.Asset.Labels[LABEL_KERNEL_RUNNING] = kernel.Version
}
}

for _, pkg := range rb.PythonPackages {
if rb.Packages != nil {
for _, pkg := range rb.Packages {
bomPkg := &sbom.Package{
Name: pkg.Name,
Version: pkg.Version,
Purl: pkg.Purl,
Cpes: pkg.CPEs,
Type: "pypi",
}

// deprecated path, all files are now in the FilePaths field
// TODO: update once the python resource returns multiple results
if pkg.FilePath != "" {
bomPkg.EvidenceList = append(bomPkg.EvidenceList, &sbom.Evidence{
Type: sbom.EvidenceType_EVIDENCE_TYPE_FILE,
Value: pkg.FilePath,
})
Name: pkg.Name,
Version: pkg.Version,
Architecture: pkg.Arch,
Origin: pkg.Origin,
Purl: pkg.Purl,
Cpes: pkg.CPEs,
Type: pkg.Format,
}

for _, filepath := range pkg.FilePaths {
Expand All @@ -152,30 +120,58 @@ func GenerateBom(r *reporter.Report) ([]*sbom.Sbom, error) {

bom.Packages = append(bom.Packages, bomPkg)
}
}

for _, pkg := range rb.NpmPackages {
bomPkg := &sbom.Package{
Name: pkg.Name,
Version: pkg.Version,
Purl: pkg.Purl,
Cpes: pkg.CPEs,
Type: "npm",
}
for _, pkg := range rb.PythonPackages {
bomPkg := &sbom.Package{
Name: pkg.Name,
Version: pkg.Version,
Purl: pkg.Purl,
Cpes: pkg.CPEs,
Type: "pypi",
}

for _, filepath := range pkg.FilePaths {
bomPkg.EvidenceList = append(bomPkg.EvidenceList, &sbom.Evidence{
Type: sbom.EvidenceType_EVIDENCE_TYPE_FILE,
Value: filepath,
})
}
// deprecated path, all files are now in the FilePaths field
// TODO: update once the python resource returns multiple results
if pkg.FilePath != "" {
bomPkg.EvidenceList = append(bomPkg.EvidenceList, &sbom.Evidence{
Type: sbom.EvidenceType_EVIDENCE_TYPE_FILE,
Value: pkg.FilePath,
})
}

bom.Packages = append(bom.Packages, bomPkg)
for _, filepath := range pkg.FilePaths {
bomPkg.EvidenceList = append(bomPkg.EvidenceList, &sbom.Evidence{
Type: sbom.EvidenceType_EVIDENCE_TYPE_FILE,
Value: filepath,
})
}

bom.Packages = append(bom.Packages, bomPkg)
}

for _, pkg := range rb.NpmPackages {
bomPkg := &sbom.Package{
Name: pkg.Name,
Version: pkg.Version,
Purl: pkg.Purl,
Cpes: pkg.CPEs,
Type: "npm",
}

for _, filepath := range pkg.FilePaths {
bomPkg.EvidenceList = append(bomPkg.EvidenceList, &sbom.Evidence{
Type: sbom.EvidenceType_EVIDENCE_TYPE_FILE,
Value: filepath,
})
}

bom.Packages = append(bom.Packages, bomPkg)
}
}
boms = append(boms, bom)
}
return boms, nil
return boms
}

// enrichPlatformIds adds the platform id based on cnquery ids
Expand Down
4 changes: 2 additions & 2 deletions sbom/generator/report_collection.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ package generator

import (
"encoding/json"
"go.mondoo.com/cnquery/v11/cli/reporter"
"os"

"go.mondoo.com/cnquery/v11/cli/reporter"
"sigs.k8s.io/yaml"
)

Expand Down Expand Up @@ -59,7 +60,6 @@ func LoadReport(filename string) (*reporter.Report, error) {
data, err := os.ReadFile(filename)
if err != nil {
return nil, err

}
var report *reporter.Report
err = yaml.Unmarshal(data, &report)
Expand Down
77 changes: 45 additions & 32 deletions sbom/generator/sbom_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,52 +4,65 @@
package generator

import (
"go.mondoo.com/cnquery/v11/sbom"
"testing"

"go.mondoo.com/cnquery/v11/sbom"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestSbomGeneration(t *testing.T) {
report, err := LoadReport("../testdata/alpine.json")
require.NoError(t, err)
t.Run("generate sbom from a full report", func(t *testing.T) {
report, err := LoadReport("../testdata/alpine.json")
require.NoError(t, err)

sboms, err := GenerateBom(report)
require.NoError(t, err)
sboms := GenerateBom(report)

// store bom in different formats
selectedBom := sboms[0]
// store bom in different formats
selectedBom := sboms[0]

assert.Equal(t, "alpine:latest", selectedBom.Asset.Name)
assert.Equal(t, "trace-alpine", selectedBom.Asset.TraceId)
assert.Equal(t, "aarch64", selectedBom.Asset.Platform.Arch)
assert.Equal(t, "alpine", selectedBom.Asset.Platform.Name)
assert.Equal(t, "3.19.0", selectedBom.Asset.Platform.Version)
assert.Equal(t, []string{"//platformid.api.mondoo.app/runtime/docker/images/1dc785547989b0db1c3cd9949c57574393e69bea98bfe044b0588e24721aa402"}, selectedBom.Asset.PlatformIds)
assert.Equal(t, "alpine:latest", selectedBom.Asset.Name)
assert.Equal(t, "trace-alpine", selectedBom.Asset.TraceId)
assert.Equal(t, "aarch64", selectedBom.Asset.Platform.Arch)
assert.Equal(t, "alpine", selectedBom.Asset.Platform.Name)
assert.Equal(t, "3.19.0", selectedBom.Asset.Platform.Version)
assert.Equal(t, []string{"//platformid.api.mondoo.app/runtime/docker/images/1dc785547989b0db1c3cd9949c57574393e69bea98bfe044b0588e24721aa402"}, selectedBom.Asset.PlatformIds)

// search os package
pkg := findProtoPkg(selectedBom.Packages, "alpine-baselayout")
assert.Equal(t, "alpine-baselayout", pkg.Name)
assert.Contains(t, pkg.EvidenceList, &sbom.Evidence{
Type: sbom.EvidenceType_EVIDENCE_TYPE_FILE,
Value: "etc/profile.d/color_prompt.sh.disabled",
})
// search os package
pkg := findProtoPkg(selectedBom.Packages, "alpine-baselayout")
assert.Equal(t, "alpine-baselayout", pkg.Name)
assert.Contains(t, pkg.EvidenceList, &sbom.Evidence{
Type: sbom.EvidenceType_EVIDENCE_TYPE_FILE,
Value: "etc/profile.d/color_prompt.sh.disabled",
})

// search python package
pkg = findProtoPkg(selectedBom.Packages, "pip")
assert.Equal(t, "pip", pkg.Name)
assert.Contains(t, pkg.EvidenceList, &sbom.Evidence{
Type: sbom.EvidenceType_EVIDENCE_TYPE_FILE,
Value: "/opt/lib/python3.9/site-packages/pip-21.2.4.dist-info/METADATA",
})

// search python package
pkg = findProtoPkg(selectedBom.Packages, "pip")
assert.Equal(t, "pip", pkg.Name)
assert.Contains(t, pkg.EvidenceList, &sbom.Evidence{
Type: sbom.EvidenceType_EVIDENCE_TYPE_FILE,
Value: "/opt/lib/python3.9/site-packages/pip-21.2.4.dist-info/METADATA",
// search npm package
pkg = findProtoPkg(selectedBom.Packages, "npm")
assert.Equal(t, "npm", pkg.Name)
assert.Contains(t, pkg.EvidenceList, &sbom.Evidence{
Type: sbom.EvidenceType_EVIDENCE_TYPE_FILE,
Value: "/opt/lib/node_modules/npm/package.json",
})
})
t.Run("generate sbom from a report with a package error", func(t *testing.T) {
report, err := LoadReport("testdata/alpine-failed-package.json")
require.NoError(t, err)

sboms := GenerateBom(report)

// search npm package
pkg = findProtoPkg(selectedBom.Packages, "npm")
assert.Equal(t, "npm", pkg.Name)
assert.Contains(t, pkg.EvidenceList, &sbom.Evidence{
Type: sbom.EvidenceType_EVIDENCE_TYPE_FILE,
Value: "/opt/lib/node_modules/npm/package.json",
// store bom in different formats
selectedBom := sboms[0]
assert.Equal(t, sbom.Status_STATUS_FAILED, selectedBom.Status)
assert.Contains(t, selectedBom.ErrorMessage, "failed to parse bom fields json data")
})
}

Expand Down
Loading

0 comments on commit e3c2a46

Please sign in to comment.