From 3dab5e2b2c98e717960edb03d3eed7a26dbde28a Mon Sep 17 00:00:00 2001 From: MaineK00n Date: Tue, 14 Jul 2020 22:08:16 +0900 Subject: [PATCH] change raspberry pi os use debian oval at report --- oval/util.go | 4 ++++ report/report.go | 4 ++-- report/util.go | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/oval/util.go b/oval/util.go index 29a36d29..f0bc4726 100644 --- a/oval/util.go +++ b/oval/util.go @@ -242,6 +242,10 @@ func getDefsByPackNameFromOvalDB(driver db.DB, r *models.ScanResult) (relatedDef }) } + if r.Family == "raspbian" { + r.Family = "debian" + } + for _, req := range requests { definitions, err := driver.GetByPackName(r.Family, r.Release, req.packName, req.arch) if err != nil { diff --git a/report/report.go b/report/report.go index 3600c1cf..7999dcdd 100644 --- a/report/report.go +++ b/report/report.go @@ -285,7 +285,7 @@ func FillWithOval(driver ovaldb.DB, r *models.ScanResult) (nCVEs int, err error) var ovalFamily string switch r.Family { - case c.Debian: + case c.Debian, c.Raspbian: ovalClient = oval.NewDebian() ovalFamily = c.Debian case c.Ubuntu: @@ -311,7 +311,7 @@ func FillWithOval(driver ovaldb.DB, r *models.ScanResult) (nCVEs int, err error) case c.Amazon: ovalClient = oval.NewAmazon() ovalFamily = c.Amazon - case c.Raspbian, c.FreeBSD, c.Windows: + case c.FreeBSD, c.Windows: return 0, nil case c.ServerTypePseudo: return 0, nil diff --git a/report/util.go b/report/util.go index 6e7d9dd3..58dc9bee 100644 --- a/report/util.go +++ b/report/util.go @@ -392,8 +392,7 @@ func ovalSupported(r *models.ScanResult) bool { switch r.Family { case config.Amazon, - config.FreeBSD, - config.Raspbian: + config.FreeBSD: return false } return true