Stage/vuls
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(centos): identify CentOS and CentOS Stream (#1360)

Browse Source
This commit is contained in:
MaineK00n
2022-02-03 05:32:03 +09:00
committed by GitHub
parent 7c209cc9dc
commit 2923cbc645
7 changed files with 86 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scanner/redhatbase.go
View File

@@ -54,14 +54,14 @@ func detectRedhat(c config.ServerInfo) (bool, osTypeInterface) {
release := result[2]
switch strings.ToLower(result[1]) {
case "centos", "centos linux", "centos stream":
case "centos", "centos linux":
cent := newCentOS(c)
cent.setDistro(constant.CentOS, release)
return true, cent
case "alma", "almalinux":
alma := newAlma(c)
alma.setDistro(constant.Alma, release)
return true, alma
case "centos stream":
cent := newCentOS(c)
cent.setDistro(constant.CentOS, fmt.Sprintf("stream%s", release))
return true, cent
default:
logging.Log.Warnf("Failed to parse CentOS: %s", r)
}
@@ -125,10 +125,14 @@ func detectRedhat(c config.ServerInfo) (bool, osTypeInterface) {
release := result[2]
switch strings.ToLower(result[1]) {
case "centos", "centos linux", "centos stream":
case "centos", "centos linux":
cent := newCentOS(c)
cent.setDistro(constant.CentOS, release)
return true, cent
case "centos stream":
cent := newCentOS(c)
cent.setDistro(constant.CentOS, fmt.Sprintf("stream%s", release))
return true, cent
case "alma", "almalinux":
alma := newAlma(c)
alma.setDistro(constant.Alma, release)
@@ -515,7 +519,7 @@ func (o *redhatBase) isExecNeedsRestarting() bool {
// TODO zypper ps
// https://github.com/future-architect/vuls/issues/696
return false
case constant.RedHat, constant.CentOS, constant.Rocky, constant.Oracle:
case constant.RedHat, constant.CentOS, constant.Alma, constant.Rocky, constant.Oracle:
majorVersion, err := o.Distro.MajorVersion()
if err != nil || majorVersion < 6 {
o.log.Errorf("Not implemented yet: %s, err: %+v", o.Distro, err)