oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-18 00:43:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

include ID_LIKE in distro detection

Browse Source 
Signed-off-by: Alfredo Deza <adeza@anchore.com>
This commit is contained in:
Alfredo Deza 2020-11-10 12:37:35 -05:00
parent b3098f3423
commit 64d5554144
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
syft/distro/distro.go
View File

@ -10,6 +10,7 @@ type Distro struct {
Type Type Type Type
Version *hashiVer.Version Version *hashiVer.Version
RawVersion string RawVersion string
IDLike string
} }
// NewUnknownDistro creates a standardized Distro object for unidentifiable distros // NewUnknownDistro creates a standardized Distro object for unidentifiable distros
@ -19,7 +20,7 @@ func NewUnknownDistro() Distro {
} }
} }
func NewDistro(t Type, ver string) (Distro, error) { func NewDistro(t Type, ver, like string) (Distro, error) {
if ver == "" { if ver == "" {
return Distro{Type: t}, nil return Distro{Type: t}, nil
} }
@ -31,6 +32,7 @@ func NewDistro(t Type, ver string) (Distro, error) {
Type: t, Type: t,
Version: verObj, Version: verObj,
RawVersion: ver, RawVersion: ver,
IDLike: like,
}, nil }, nil
} }

9
syft/distro/distro_test.go
View File

@ -33,7 +33,7 @@ func TestDistro_FullVersion(t *testing.T) {
for _, test := range tests { for _, test := range tests {
name := fmt.Sprintf("%s:%s", test.dist, test.version) name := fmt.Sprintf("%s:%s", test.dist, test.version)
t.Run(name, func(t *testing.T) { t.Run(name, func(t *testing.T) {
d, err := NewDistro(test.dist, test.version) d, err := NewDistro(test.dist, test.version, "")
if err != nil { if err != nil {
t.Errorf("could not create distro='%+v:%+v': %+v", test.dist, test.version, err) t.Errorf("could not create distro='%+v:%+v': %+v", test.dist, test.version, err)
} }
@ -53,29 +53,34 @@ func TestDistro_MajorVersion(t *testing.T) {
dist Type dist Type
version string version string
expected string expected string
like string
}{ }{
{ {
version: "8", version: "8",
expected: "8", expected: "8",
like: "",
}, },
{ {
version: "18.04", version: "18.04",
expected: "18", expected: "18",
like: "debian",
}, },
{ {
version: "0", version: "0",
expected: "0", expected: "0",
like: "",
}, },
{ {
version: "18.1.2", version: "18.1.2",
expected: "18", expected: "18",
like: "debian",
}, },
} }
for _, test := range tests { for _, test := range tests {
name := fmt.Sprintf("%s:%s", test.dist, test.version) name := fmt.Sprintf("%s:%s", test.dist, test.version)
t.Run(name, func(t *testing.T) { t.Run(name, func(t *testing.T) {
d, err := NewDistro(test.dist, test.version) d, err := NewDistro(test.dist, test.version, test.like)
if err != nil { if err != nil {
t.Errorf("could not create distro='%+v:%+v': %+v", test.dist, test.version, err) t.Errorf("could not create distro='%+v:%+v': %+v", test.dist, test.version, err)
} }

12
syft/distro/identify.go
View File

@ -81,7 +81,7 @@ identifyLoop:
return distro return distro
} }
func assemble(name, version string) *Distro { func assemble(name, version, like string) *Distro {
distroType, ok := IDMapping[name] distroType, ok := IDMapping[name]
// Both distro and version must be present // Both distro and version must be present
@ -90,7 +90,7 @@ func assemble(name, version string) *Distro {
} }
if ok { if ok {
distro, err := NewDistro(distroType, version) distro, err := NewDistro(distroType, version, like)
if err != nil { if err != nil {
return nil return nil
} }
@ -101,7 +101,7 @@ func assemble(name, version string) *Distro {
} }
func parseOsRelease(contents string) *Distro { func parseOsRelease(contents string) *Distro {
id, vers := "", "" id, vers, like := "", "", ""
for _, line := range strings.Split(contents, "\n") { for _, line := range strings.Split(contents, "\n") {
parts := strings.Split(line, "=") parts := strings.Split(line, "=")
prefix := parts[0] prefix := parts[0]
@ -112,10 +112,12 @@ func parseOsRelease(contents string) *Distro {
id = strings.TrimSpace(value) id = strings.TrimSpace(value)
case "VERSION_ID": case "VERSION_ID":
vers = strings.TrimSpace(value) vers = strings.TrimSpace(value)
case "ID_LIKE":
like = strings.TrimSpace(value)
} }
} }
return assemble(id, vers) return assemble(id, vers, like)
} }
var busyboxVersionMatcher = regexp.MustCompile(`BusyBox v[\d\.]+`) var busyboxVersionMatcher = regexp.MustCompile(`BusyBox v[\d\.]+`)
@ -125,7 +127,7 @@ func parseBusyBox(contents string) *Distro {
for _, match := range matches { for _, match := range matches {
parts := strings.Split(match, " ") parts := strings.Split(match, " ")
version := strings.ReplaceAll(parts[1], "v", "") version := strings.ReplaceAll(parts[1], "v", "")
distro := assemble("busybox", version) distro := assemble("busybox", version, "")
if distro != nil { if distro != nil {
return distro return distro
} }