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

Rename PackageInfoList to Packages

Browse Source
This commit is contained in:
Kota Kanbe
2017-05-06 04:59:12 +09:00
committed by kota kanbe
parent f26b61d773
commit d626cc8a8b
17 changed files with 168 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scan/freebsd.go
View File

@@ -71,7 +71,7 @@ func (o *bsd) checkDependencies() error {
func (o *bsd) scanPackages() error {
var err error
var packs []models.PackageInfo
var packs []models.Package
if packs, err = o.scanInstalledPackages(); err != nil {
o.log.Errorf("Failed to scan installed packages")
return err
@@ -87,7 +87,7 @@ func (o *bsd) scanPackages() error {
return nil
}
func (o *bsd) scanInstalledPackages() ([]models.PackageInfo, error) {
func (o *bsd) scanInstalledPackages() ([]models.Package, error) {
cmd := util.PrependProxyEnv("pkg version -v")
r := o.exec(cmd, noSudo)
if !r.isSuccess() {
@@ -143,7 +143,7 @@ func (o *bsd) scanUnsecurePackages() (vulnInfos []models.VulnInfo, err error) {
}
for k := range cveIDAdtMap {
packs := []models.PackageInfo{}
packs := []models.Package{}
for _, r := range cveIDAdtMap[k] {
packs = append(packs, r.pack)
}
@@ -165,7 +165,7 @@ func (o *bsd) scanUnsecurePackages() (vulnInfos []models.VulnInfo, err error) {
return
}
func (o *bsd) parsePkgVersion(stdout string) (packs []models.PackageInfo) {
func (o *bsd) parsePkgVersion(stdout string) (packs []models.Package) {
lines := strings.Split(stdout, "\n")
for _, l := range lines {
fields := strings.Fields(l)
@@ -180,13 +180,13 @@ func (o *bsd) parsePkgVersion(stdout string) (packs []models.PackageInfo) {
switch fields[1] {
case "?", "=":
packs = append(packs, models.PackageInfo{
packs = append(packs, models.Package{
Name: name,
Version: ver,
})
case "<":
candidate := strings.TrimSuffix(fields[6], ")")
packs = append(packs, models.PackageInfo{
packs = append(packs, models.Package{
Name: name,
Version: ver,
NewVersion: candidate,
@@ -202,7 +202,7 @@ type vulnIDCveIDs struct {
}
type pkgAuditResult struct {
pack models.PackageInfo
pack models.Package
vulnIDCveIDs vulnIDCveIDs
}