From 6bceddeeda2ed26bc2cf158055e228db5c85118f Mon Sep 17 00:00:00 2001 From: Kota Kanbe Date: Wed, 20 Oct 2021 11:10:33 +0900 Subject: [PATCH] chore: update goval-dictionary (#1323) * chore: update goval-dictionary * fix errs --- detector/detector.go | 2 +- go.mod | 6 +++--- go.sum | 13 ++++++------- oval/alpine.go | 2 +- oval/debian.go | 4 ++-- oval/oval.go | 13 ++++--------- oval/redhat.go | 2 +- oval/suse.go | 2 +- 8 files changed, 19 insertions(+), 25 deletions(-) diff --git a/detector/detector.go b/detector/detector.go index 10cf319d..95352518 100644 --- a/detector/detector.go +++ b/detector/detector.go @@ -190,7 +190,7 @@ func Detect(rs []models.ScanResult, dir string) ([]models.ScanResult, error) { // IgnoreUnscored if config.Conf.IgnoreUnscoredCves { r.ScannedCves, nFiltered = r.ScannedCves.FindScoredVulns() - logging.Log.Infof("%s: %d CVEs filtered by --ignore-unscored-cves", r.FormatServerName(), nFiltered, config.Conf.IgnoreUnscoredCves) + logging.Log.Infof("%s: %d CVEs filtered by --ignore-unscored-cves", r.FormatServerName(), nFiltered) } r.FilterInactiveWordPressLibs(config.Conf.WpScan.DetectInactive) diff --git a/go.mod b/go.mod index 0f9c63d8..08265885 100644 --- a/go.mod +++ b/go.mod @@ -55,9 +55,9 @@ require ( github.com/vulsio/go-exploitdb v0.4.2-0.20210930235136-c10d2716b7e2 github.com/vulsio/go-msfdb v0.2.1-0.20210928020521-9b56a938f544 github.com/vulsio/gost v0.4.1-0.20210928234623-3e6372ba2821 - github.com/vulsio/goval-dictionary v0.6.1 + github.com/vulsio/goval-dictionary v0.6.1-0.20211020012854-1ceb24aae1a7 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect - golang.org/x/net v0.0.0-20211011170408-caeb26a5c8c0 // indirect + golang.org/x/net v0.0.0-20211019232329-c6ed85c7a12d // indirect golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f golang.org/x/sync v0.0.0-20210220032951-036812b2e83c golang.org/x/text v0.3.7 // indirect @@ -142,7 +142,7 @@ require ( go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.19.1 // indirect - golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac // indirect + golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.27.1 // indirect diff --git a/go.sum b/go.sum index 7938b653..f55a741f 100644 --- a/go.sum +++ b/go.sum @@ -1118,7 +1118,6 @@ github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= @@ -1618,8 +1617,8 @@ github.com/vulsio/go-msfdb v0.2.1-0.20210928020521-9b56a938f544 h1:wG6rTODeLpm+N github.com/vulsio/go-msfdb v0.2.1-0.20210928020521-9b56a938f544/go.mod h1:QsHhtjF4hAheLgeGJQRv/ccmE3txtOSgwzTgziyStKY= github.com/vulsio/gost v0.4.1-0.20210928234623-3e6372ba2821 h1:MPbc8QNX9Rld5ksdWTWMdKbxfgj4qhiXosEvwfRl9Jk= github.com/vulsio/gost v0.4.1-0.20210928234623-3e6372ba2821/go.mod h1:49trASwbe0ZhntJhEc1rv3MDGUpIhIkZktELgZ8a5YA= -github.com/vulsio/goval-dictionary v0.6.1 h1:w2AXwgPWD5/IrJ+44ywD0u5I9ILNdHvzlR+n6iu0eAQ= -github.com/vulsio/goval-dictionary v0.6.1/go.mod h1:RU1jWunEAwnErgIbM5Hc2j4OnTHQEvMagBq6/6wfWPU= +github.com/vulsio/goval-dictionary v0.6.1-0.20211020012854-1ceb24aae1a7 h1:YS3DggefYXKg2SOFdd2a9BKiugZntSDtVCiolj3HJbA= +github.com/vulsio/goval-dictionary v0.6.1-0.20211020012854-1ceb24aae1a7/go.mod h1:drWHfa4y/l/GwiXJzNLTJSzugcI4O7SxdxFFxyuox1o= github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= github.com/xanzy/go-gitlab v0.31.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug= @@ -1858,8 +1857,8 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211011170408-caeb26a5c8c0 h1:qOfNqBm5gk93LjGZo1MJaKY6Bph39zOKz1Hz2ogHj1w= -golang.org/x/net v0.0.0-20211011170408-caeb26a5c8c0/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211019232329-c6ed85c7a12d h1:HQcdyB13Mr2DxEMfcsz71PHjYBVFpb6W3aCYFv+cDdk= +golang.org/x/net v0.0.0-20211019232329-c6ed85c7a12d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -2014,8 +2013,8 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac h1:oN6lz7iLW/YC7un8pq+9bOLyXrprv2+DKfkJY+2LJJw= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M= diff --git a/oval/alpine.go b/oval/alpine.go index 4483f489..3657fc44 100644 --- a/oval/alpine.go +++ b/oval/alpine.go @@ -33,7 +33,7 @@ func (o Alpine) FillWithOval(r *models.ScanResult) (nCVEs int, err error) { return 0, err } } else { - driver, err := newOvalDB(o.Cnf, r.Family) + driver, err := newOvalDB(o.Cnf) if err != nil { return 0, err } diff --git a/oval/debian.go b/oval/debian.go index da3b3a1b..f1ac8064 100644 --- a/oval/debian.go +++ b/oval/debian.go @@ -158,7 +158,7 @@ func (o Debian) FillWithOval(r *models.ScanResult) (nCVEs int, err error) { return 0, err } } else { - driver, err := newOvalDB(o.Cnf, r.Family) + driver, err := newOvalDB(o.Cnf) if err != nil { return 0, err } @@ -472,7 +472,7 @@ func (o Ubuntu) fillWithOval(r *models.ScanResult, kernelNamesInOval []string) ( return 0, err } } else { - driver, err := newOvalDB(o.Cnf, r.Family) + driver, err := newOvalDB(o.Cnf) if err != nil { return 0, err } diff --git a/oval/oval.go b/oval/oval.go index 73c14f5d..5662cb44 100644 --- a/oval/oval.go +++ b/oval/oval.go @@ -36,7 +36,7 @@ func (b Base) CheckIfOvalFetched(osFamily, release string) (fetched bool, err er return false, err } if !b.Cnf.IsFetchViaHTTP() { - driver, err := newOvalDB(b.Cnf, ovalFamily) + driver, err := newOvalDB(b.Cnf) if err != nil { return false, err } @@ -75,7 +75,7 @@ func (b Base) CheckIfOvalFresh(osFamily, release string) (ok bool, err error) { } var lastModified time.Time if !b.Cnf.IsFetchViaHTTP() { - driver, err := newOvalDB(b.Cnf, ovalFamily) + driver, err := newOvalDB(b.Cnf) if err != nil { return false, err } @@ -112,7 +112,7 @@ func (b Base) CheckIfOvalFresh(osFamily, release string) (ok bool, err error) { } // NewOvalDB returns oval db client -func newOvalDB(cnf config.VulnDictInterface, familyInScanResult string) (driver db.DB, err error) { +func newOvalDB(cnf config.VulnDictInterface) (driver db.DB, err error) { if cnf.IsFetchViaHTTP() { return nil, nil } @@ -122,12 +122,7 @@ func newOvalDB(cnf config.VulnDictInterface, familyInScanResult string) (driver path = cnf.GetSQLite3Path() } - ovalFamily, err := GetFamilyInOval(familyInScanResult) - if err != nil { - return nil, err - } - - driver, locked, err := db.NewDB(ovalFamily, cnf.GetType(), path, cnf.GetDebugSQL()) + driver, locked, err := db.NewDB(cnf.GetType(), path, cnf.GetDebugSQL()) if err != nil { if locked { err = xerrors.Errorf("SQLite3: %s is locked. err: %w", cnf.GetSQLite3Path(), err) diff --git a/oval/redhat.go b/oval/redhat.go index e7c43ca7..0907dcf2 100644 --- a/oval/redhat.go +++ b/oval/redhat.go @@ -28,7 +28,7 @@ func (o RedHatBase) FillWithOval(r *models.ScanResult) (nCVEs int, err error) { return 0, err } } else { - driver, err := newOvalDB(o.Cnf, r.Family) + driver, err := newOvalDB(o.Cnf) if err != nil { return 0, err } diff --git a/oval/suse.go b/oval/suse.go index fcfdcdb1..c7013c4d 100644 --- a/oval/suse.go +++ b/oval/suse.go @@ -35,7 +35,7 @@ func (o SUSE) FillWithOval(r *models.ScanResult) (nCVEs int, err error) { return 0, err } } else { - driver, err := newOvalDB(o.Cnf, r.Family) + driver, err := newOvalDB(o.Cnf) if err != nil { return 0, err }