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(amazon): save system files for pkgs containing amzn in src #5951

Merged
merged 2 commits into from
Jan 17, 2024
+66 −3
Merged

fix(amazon): save system files for pkgs containing amzn in src #5951

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
24a8aff
fix(amazon): save system files for pkgs containing `amzn` in src
DmitriyLewen Jan 16, 2024
7146d13
refactor
knqyf263 Jan 17, 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
13 changes: 10 additions & 3 deletions pkg/fanal/analyzer/pkg/rpm/rpm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func (a rpmPkgAnalyzer) listPkgs(db RPMDB) (types.Packages, []string, error) {
// Check if the package is vendor-provided.
// If the package is not provided by vendor, the installed files should not be skipped.
var files []string
if packageProvidedByVendor(pkg.Vendor) {
if packageProvidedByVendor(pkg) {
files, err = pkg.InstalledFileNames()
if err != nil {
return nil, nil, xerrors.Errorf("unable to get installed files: %w", err)
Expand Down Expand Up @@ -235,12 +235,19 @@ func splitFileName(filename string) (name, ver, rel string, err error) {
return name, ver, rel, nil
}

func packageProvidedByVendor(pkgVendor string) bool {
func packageProvidedByVendor(pkg *rpmdb.PackageInfo) bool {
if pkg.Vendor == "" {
// Official Amazon packages may not contain `Vendor` field:
// https://github.com/aquasecurity/trivy/issues/5887
return strings.Contains(pkg.Release, "amzn")
}

for _, vendor := range osVendors {
if strings.HasPrefix(pkgVendor, vendor) {
if strings.HasPrefix(pkg.Vendor, vendor) {
return true
}
}

return false
}

Expand Down
56 changes: 56 additions & 0 deletions pkg/fanal/analyzer/pkg/rpm/rpm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,62 @@ func Test_rpmPkgAnalyzer_listPkgs(t *testing.T) {
"/lib64/libm-2.27.so",
},
},
{
name: "Amazon official package without `Vendor` field",
mock: mock{
packages: []*rpmdb.PackageInfo{
{
Name: "curl-minimal",
Version: "8.3.0",
Release: "1.amzn2023.0.2",
Arch: "aarch64",
SourceRpm: "curl-8.3.0-1.amzn2023.0.2.src.rpm",
DirNames: []string{
"/usr/bin/",
"/usr/lib/",
"/usr/lib/.build-id/",
"/usr/lib/.build-id/aa/",
"/usr/share/man/man1/",
},
DirIndexes: []int32{0, 1, 2, 3, 4},
BaseNames: []string{
"curl",
".build-id",
"aa",
"d987ea9bc1c73706d12c7a143ee792117851ff",
"curl.1.gz",
},
Vendor: "",
},
},
},
wantPkgs: types.Packages{
{
ID: "curl-minimal@8.3.0-1.amzn2023.0.2.aarch64",
Name: "curl-minimal",
Version: "8.3.0",
Release: "1.amzn2023.0.2",
Arch: "aarch64",
SrcName: "curl",
SrcVersion: "8.3.0",
SrcRelease: "1.amzn2023.0.2",
InstalledFiles: []string{
"/usr/bin/curl",
"/usr/lib/.build-id",
"/usr/lib/.build-id/aa",
"/usr/lib/.build-id/aa/d987ea9bc1c73706d12c7a143ee792117851ff",
"/usr/share/man/man1/curl.1.gz",
},
},
},
wantFiles: []string{
"/usr/bin/curl",
"/usr/lib/.build-id",
"/usr/lib/.build-id/aa",
"/usr/lib/.build-id/aa/d987ea9bc1c73706d12c7a143ee792117851ff",
"/usr/share/man/man1/curl.1.gz",
},
},
{
name: "invalid source rpm",
mock: mock{
Expand Down