Skip to content

Commit 6c02a38

Browse files
authored
add Arch for amazon linux scan (fanal#21)
1 parent 4e0c7fc commit 6c02a38

File tree

5 files changed

+374
-364
lines changed

5 files changed

+374
-364
lines changed

analyzer/analyzer.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,13 @@ type Package struct {
5858
Version string
5959
Release string
6060
Epoch int
61+
Arch string
6162
SrcName string
6263
SrcVersion string
6364
SrcRelease string
6465
SrcEpoch int
6566
}
6667

67-
var (
68-
TypeBinary = "binary"
69-
TypeSource = "source"
70-
)
71-
7268
type SrcPackage struct {
7369
Name string `json:"name"`
7470
Version string `json:"version"`
@@ -161,7 +157,7 @@ func GetPackages(filesMap extractor.FileMap) ([]Package, error) {
161157
}
162158
return pkgs, nil
163159
}
164-
return nil, ErrUnknownOS
160+
return nil, ErrPkgAnalysis
165161
}
166162

167163
func GetPackagesFromCommands(targetOS OS, filesMap extractor.FileMap) ([]Package, error) {

analyzer/pkg/rpm/rpm.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,16 @@ func (a rpmPkgAnalyzer) parsePkgInfo(packageBytes []byte) (pkgs []analyzer.Packa
6262
}
6363

6464
for _, pkg := range pkgList {
65+
arch := pkg.Arch
66+
if arch == "" {
67+
arch = "(none)"
68+
}
6569
p := analyzer.Package{
6670
Name: pkg.Name,
6771
Epoch: pkg.Epoch,
6872
Version: pkg.Version,
6973
Release: pkg.Release,
74+
Arch: arch,
7075
}
7176
pkgs = append(pkgs, p)
7277
}

0 commit comments

Comments
 (0)