feat: set InstalledFiles for DEB and RPM packages (#5488)

Signed-off-by: knqyf263 <knqyf263@gmail.com> Co-authored-by: knqyf263 <knqyf263@gmail.com>
aquasecurity · Nov 16, 2023 · 44d0b28 · 44d0b28
1 parent ae4bcf6
commit 44d0b28
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/pkg/fanal/analyzer/pkg/dpkg/dpkg.go b/pkg/fanal/analyzer/pkg/dpkg/dpkg.go
@@ -65,6 +65,8 @@ func (a dpkgAnalyzer) PostAnalyze(_ context.Context, input analyzer.PostAnalysis
 		return path != availableFile
 	}
 
+	packageFiles := make(map[string][]string)
+
 	// parse other files
 	err = fsutils.WalkDir(input.FS, ".", required, func(path string, d fs.DirEntry, r io.Reader) error {
 		// parse list files
@@ -74,6 +76,7 @@ func (a dpkgAnalyzer) PostAnalyze(_ context.Context, input analyzer.PostAnalysis
 			if err != nil {
 				return err
 			}
+			packageFiles[strings.TrimSuffix(filepath.Base(path), ".list")] = systemFiles
 			systemInstalledFiles = append(systemInstalledFiles, systemFiles...)
 			return nil
 		}
@@ -89,6 +92,17 @@ func (a dpkgAnalyzer) PostAnalyze(_ context.Context, input analyzer.PostAnalysis
 		return nil, xerrors.Errorf("dpkg walk error: %w", err)
 	}
 
+	// map the packages to their respective files
+	for i, pkgInfo := range packageInfos {
+		for j, pkg := range pkgInfo.Packages {
+			installedFiles, found := packageFiles[pkg.Name]
+			if !found {
+				installedFiles = packageFiles[pkg.Name+":"+pkg.Arch]
+			}
+			packageInfos[i].Packages[j].InstalledFiles = installedFiles
+		}
+	}
+
 	return &analyzer.AnalysisResult{
 		PackageInfos:         packageInfos,
 		SystemInstalledFiles: systemInstalledFiles,

diff --git a/pkg/fanal/analyzer/pkg/rpm/rpm.go b/pkg/fanal/analyzer/pkg/rpm/rpm.go
@@ -138,9 +138,10 @@ func (a rpmPkgAnalyzer) listPkgs(db RPMDB) (types.Packages, []string, error) {
 			if err != nil {
 				return nil, nil, xerrors.Errorf("unable to get installed files: %w", err)
 			}
-			files = lo.Map(files, func(file string, _ int) string {
-				return filepath.ToSlash(file)
-			})
+
+			for i, file := range files {
+				files[i] = filepath.ToSlash(file)
+			}
 		}
 
 		// RPM DB uses MD5 digest
@@ -171,6 +172,7 @@ func (a rpmPkgAnalyzer) listPkgs(db RPMDB) (types.Packages, []string, error) {
 			DependsOn:       pkg.Requires, // Will be replaced with package IDs
 			Maintainer:      pkg.Vendor,
 			Digest:          d,
+			InstalledFiles:  files,
 		}
 		pkgs = append(pkgs, p)
 		installedFiles = append(installedFiles, files...)

diff --git a/pkg/fanal/analyzer/pkg/rpm/rpm_test.go b/pkg/fanal/analyzer/pkg/rpm/rpm_test.go
@@ -151,6 +151,11 @@ func Test_rpmPkgAnalyzer_listPkgs(t *testing.T) {
 					SrcVersion: "2.17",
 					SrcRelease: "317.el7",
 					Maintainer: "Red Hat",
+					InstalledFiles: []string{
+						"/etc/ld.so.conf",
+						"/etc/rpc",
+						"/lib64/libm-2.27.so",
+					},
 				},
 			},
 			wantFiles: []string{