Skip to content

Commit

Permalink
fix: use official CPE for linux kernel (#3343)
Browse files Browse the repository at this point in the history
Signed-off-by: Weston Steimel <[email protected]>
  • Loading branch information
westonsteimel authored Oct 17, 2024
1 parent 80c8bc1 commit 5b9601d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
2 changes: 2 additions & 0 deletions syft/pkg/cataloger/kernel/cataloger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"testing"

"github.com/anchore/syft/syft/artifact"
"github.com/anchore/syft/syft/cpe"
"github.com/anchore/syft/syft/file"
"github.com/anchore/syft/syft/pkg"
"github.com/anchore/syft/syft/pkg/cataloger/internal/pkgtest"
Expand All @@ -22,6 +23,7 @@ func Test_KernelCataloger(t *testing.T) {
),
Type: pkg.LinuxKernelPkg,
PURL: "pkg:generic/[email protected]_64",
CPEs: []cpe.CPE{cpe.Must("cpe:2.3:o:linux:linux_kernel:6.0.7-301.fc37.x86_64:*:*:*:*:*:*:*", cpe.NVDDictionaryLookupSource)},
Metadata: pkg.LinuxKernel{
Name: "",
Architecture: "x86",
Expand Down
15 changes: 15 additions & 0 deletions syft/pkg/cataloger/kernel/package.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,26 @@ import (
"strings"

"github.com/anchore/packageurl-go"
"github.com/anchore/syft/syft/cpe"
"github.com/anchore/syft/syft/file"
"github.com/anchore/syft/syft/pkg"
)

const linuxKernelPackageName = "linux-kernel"

func createLinuxKernelCPEs(version string) []cpe.CPE {
c := cpe.NewWithAny()
c.Part = "o"
c.Product = "linux_kernel"
c.Vendor = "linux"
c.Version = version
if cpe.ValidateString(c.String()) != nil {
return nil
}

return []cpe.CPE{{Attributes: c, Source: cpe.NVDDictionaryLookupSource}}
}

func newLinuxKernelPackage(metadata pkg.LinuxKernel, archiveLocation file.Location) pkg.Package {
p := pkg.Package{
Name: linuxKernelPackageName,
Expand All @@ -18,6 +32,7 @@ func newLinuxKernelPackage(metadata pkg.LinuxKernel, archiveLocation file.Locati
PURL: packageURL(linuxKernelPackageName, metadata.Version),
Type: pkg.LinuxKernelPkg,
Metadata: metadata,
CPEs: createLinuxKernelCPEs(metadata.Version),
}

p.SetID()
Expand Down

0 comments on commit 5b9601d

Please sign in to comment.