Skip to content

Yli3/os release to cpe #19407

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

Draft
daynewlee wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Yli3/os release to cpe #19407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39c006e
added claircore osrelease.Scanner
daynewlee Mar 12, 2026
083e52a
use scan os release
daynewlee Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions compliance/node/index/indexer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/quay/claircore"
ccindexer "github.com/quay/claircore/indexer"
"github.com/quay/claircore/indexer/controller"
"github.com/quay/claircore/osrelease"
"github.com/quay/claircore/rhel"
"github.com/quay/zlog"
"github.com/rs/zerolog"
Expand Down Expand Up @@ -190,6 +191,13 @@ func (l *localNodeIndexer) IndexNode(ctx context.Context) (*v4.IndexReport, erro
return nil, errors.Wrap(err, "converting clair report to v4 report")
}

dists, err := runOSScanner(ctx, layer)
if err != nil {
return nil, errors.Wrap(err, "failed to scan os-release")
}
if len(dists) > 0 {
report.Distro = mapDistribution(dists[0])
}
return report, nil
}

Expand Down Expand Up @@ -283,3 +291,30 @@ func runCoalescer(ctx context.Context, layerDigest claircore.Digest, repos []*cl

return ir, nil
}

func runOSScanner(ctx context.Context, layer *claircore.Layer) ([]*claircore.Distribution, error) {
scanner := &osrelease.Scanner{}
dists, err := scanner.Scan(ctx, layer)
if err != nil {
return nil, err
}
// ID is required for the coalescer to link artifacts correctly
for i, d := range dists {
d.ID = strconv.Itoa(i)
}
return dists, nil
}

func mapDistribution(ccDist *claircore.Distribution) *v4.Distribution {
return &v4.Distribution{
Id: ccDist.ID,
Did: ccDist.DID,
Name: ccDist.Name,
Version: ccDist.Version,
VersionCodeName: ccDist.VersionCodeName,
VersionId: ccDist.VersionID,
Arch: ccDist.Arch,
Cpe: ccDist.CPE.BindFS(), // Converts WFN object to string
PrettyName: ccDist.PrettyName,
}
}
29 changes: 20 additions & 9 deletions generated/internalapi/scanner/v4/index_report.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

90 changes: 90 additions & 0 deletions generated/internalapi/scanner/v4/index_report_vtproto.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion proto/internalapi/scanner/v4/index_report.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ message IndexReport {
bool success = 3;
string err = 4;
Contents contents = 5;
}
Distribution distro = 6;
}
2 changes: 1 addition & 1 deletion proto/storage/proto.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20361,4 +20361,4 @@
}
}
]
}
}
Loading