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

fix(sbom): don't overwrite srcEpoch when decoding SBOM files #6866

Merged
merged 2 commits into from
Jun 7, 2024
Merged

fix(sbom): don't overwrite srcEpoch when decoding SBOM files #6866

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dba915e
fix(bom): check srcName + srcVersion before take info from pkg
DmitriyLewen Jun 6, 2024
b442097
refactor: remove debug fmt
DmitriyLewen Jun 6, 2024
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
5 changes: 5 additions & 0 deletions pkg/sbom/io/decode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,11 @@ func (m *Decoder) fillSrcPkg(c *core.Component, pkg *ftypes.Package) {
}
m.parseSrcVersion(pkg, c.SrcVersion)

// Source info was added from component or properties
if pkg.SrcName != "" && pkg.SrcVersion != "" {
return
}

// Fill source package information for components in third-party SBOMs .
if pkg.SrcName == "" {
pkg.SrcName = pkg.Name
Expand Down