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

feat(amazon): support Amazon Linux 2 Extra Repository (#1510)

Browse Source 
* feat(amazon): support Amazon Linux 2 Extra Repository

* feat(amazon): set Amazon Linux EOL

* feat(oracle): set Oracle Linux EOL
This commit is contained in:
MaineK00n
2022-08-04 17:52:42 +09:00
committed by GitHub
parent f1c78e42a2
commit ca3f6b1dbf
8 changed files with 386 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
scanner/redhatbase.go
View File

@@ -448,13 +448,28 @@ func (o *redhatBase) scanInstalledPackages() (models.Packages, error) {
Version: version,
}
r := o.exec(o.rpmQa(), noSudo)
var r execResult
switch o.getDistro().Family {
case constant.Amazon:
switch strings.Fields(o.getDistro().Release)[0] {
case "2":
if o.exec("rpm -q yum-utils", noSudo).isSuccess() {
r = o.exec("repoquery --all --pkgnarrow=installed --qf='%{NAME} %{EPOCH} %{VERSION} %{RELEASE} %{ARCH} %{UI_FROM_REPO}'", o.sudo.repoquery())
} else {
r = o.exec(o.rpmQa(), noSudo)
}
default:
r = o.exec(o.rpmQa(), noSudo)
}
default:
r = o.exec(o.rpmQa(), noSudo)
}
if !r.isSuccess() {
return nil, xerrors.Errorf("Scan packages failed: %s", r)
}
installed, _, err := o.parseInstalledPackages(r.Stdout)
if err != nil {
return nil, err
return nil, xerrors.Errorf("Failed to parse installed packages. err: %w", err)
}
return installed, nil
}
@@ -469,7 +484,29 @@ func (o *redhatBase) parseInstalledPackages(stdout string) (models.Packages, mod
if trimmed := strings.TrimSpace(line); trimmed == "" {
continue
}
pack, err := o.parseInstalledPackagesLine(line)
var (
pack *models.Package
err error
)
switch o.getDistro().Family {
case constant.Amazon:
switch strings.Fields(o.getDistro().Release)[0] {
case "2":
switch len(strings.Fields(line)) {
case 5:
pack, err = o.parseInstalledPackagesLine(line)
case 6:
pack, err = o.parseInstalledPackagesLineFromRepoquery(line)
default:
return nil, nil, xerrors.Errorf("Failed to parse package line: %s", line)
}
default:
pack, err = o.parseInstalledPackagesLine(line)
}
default:
pack, err = o.parseInstalledPackagesLine(line)
}
if err != nil {
return nil, nil, err
}
@@ -522,6 +559,34 @@ func (o *redhatBase) parseInstalledPackagesLine(line string) (*models.Package, e
}, nil
}
func (o *redhatBase) parseInstalledPackagesLineFromRepoquery(line string) (*models.Package, error) {
fields := strings.Fields(line)
if len(fields) != 6 {
return nil, xerrors.Errorf("Failed to parse package line: %s", line)
}
ver := ""
epoch := fields[1]
if epoch == "0" || epoch == "(none)" {
ver = fields[2]
} else {
ver = fmt.Sprintf("%s:%s", epoch, fields[2])
}
repo := strings.TrimPrefix(fields[5], "@")
if repo == "installed" {
repo = "amzn2-core"
}
return &models.Package{
Name: fields[0],
Version: ver,
Release: fields[3],
Arch: fields[4],
Repository: repo,
}, nil
}
func (o *redhatBase) parseRpmQfLine(line string) (pkg *models.Package, ignored bool, err error) {
for _, suffix := range []string{
"Permission denied",