From ffdb78962f9bc96df527bb468ed3d5856337a395 Mon Sep 17 00:00:00 2001 From: sadayuki-matsuno Date: Fri, 29 Oct 2021 11:24:49 +0900 Subject: [PATCH] update dictionaries (#1326) --- detector/cve_client.go | 2 +- detector/exploitdb.go | 2 +- detector/msf.go | 2 +- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- gost/gost.go | 2 +- oval/oval.go | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/detector/cve_client.go b/detector/cve_client.go index 7e2174b9..076b5623 100644 --- a/detector/cve_client.go +++ b/detector/cve_client.go @@ -216,7 +216,7 @@ func newCveDB(cnf config.VulnDictInterface) (driver cvedb.DB, locked bool, err e if cnf.GetType() == "sqlite3" { path = cnf.GetSQLite3Path() } - driver, locked, err = cvedb.NewDB(cnf.GetType(), path, cnf.GetDebugSQL()) + driver, locked, err = cvedb.NewDB(cnf.GetType(), path, cnf.GetDebugSQL(), cvedb.Option{}) if err != nil { err = xerrors.Errorf("Failed to init CVE DB. err: %w, path: %s", err, path) return nil, locked, err diff --git a/detector/exploitdb.go b/detector/exploitdb.go index b7fb8d11..c7180d37 100644 --- a/detector/exploitdb.go +++ b/detector/exploitdb.go @@ -211,7 +211,7 @@ func newExploitDB(cnf config.VulnDictInterface) (driver exploitdb.DB, locked boo if cnf.GetType() == "sqlite3" { path = cnf.GetSQLite3Path() } - if driver, locked, err = exploitdb.NewDB(cnf.GetType(), path, cnf.GetDebugSQL()); err != nil { + if driver, locked, err = exploitdb.NewDB(cnf.GetType(), path, cnf.GetDebugSQL(), exploitdb.Option{}); err != nil { if locked { return nil, true, xerrors.Errorf("exploitDB is locked. err: %w", err) } diff --git a/detector/msf.go b/detector/msf.go index 8252c2a5..2193cb74 100644 --- a/detector/msf.go +++ b/detector/msf.go @@ -207,7 +207,7 @@ func newMetasploitDB(cnf config.VulnDictInterface) (driver metasploitdb.DB, lock if cnf.GetType() == "sqlite3" { path = cnf.GetSQLite3Path() } - if driver, locked, err = metasploitdb.NewDB(cnf.GetType(), path, cnf.GetDebugSQL()); err != nil { + if driver, locked, err = metasploitdb.NewDB(cnf.GetType(), path, cnf.GetDebugSQL(), metasploitdb.Option{}); err != nil { if locked { return nil, true, xerrors.Errorf("metasploitDB is locked. err: %w", err) } diff --git a/go.mod b/go.mod index fbbcf412..45cc7b19 100644 --- a/go.mod +++ b/go.mod @@ -51,11 +51,11 @@ require ( github.com/spf13/afero v1.6.0 github.com/spf13/cast v1.4.1 // indirect github.com/spf13/cobra v1.2.1 - github.com/vulsio/go-cve-dictionary v0.8.2-0.20211013020338-ec22aa70ffdb - github.com/vulsio/go-exploitdb v0.4.2-0.20210930235136-c10d2716b7e2 - github.com/vulsio/go-msfdb v0.2.1-0.20211020031651-4347c01aab66 - github.com/vulsio/gost v0.4.1-0.20210928234623-3e6372ba2821 - github.com/vulsio/goval-dictionary v0.6.1-0.20211020012854-1ceb24aae1a7 + github.com/vulsio/go-cve-dictionary v0.8.2-0.20211028094424-0a854f8e8f85 + github.com/vulsio/go-exploitdb v0.4.2-0.20211028071949-1ebf9c4f6c4d + github.com/vulsio/go-msfdb v0.2.1-0.20211028071756-4a9759bd9f14 + github.com/vulsio/gost v0.4.1-0.20211028071837-7ad032a6ffa8 + github.com/vulsio/goval-dictionary v0.6.1-0.20211028072035-e85e14b91ccc golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect golang.org/x/net v0.0.0-20211019232329-c6ed85c7a12d // indirect golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f diff --git a/go.sum b/go.sum index 7f2f612c..f98b1819 100644 --- a/go.sum +++ b/go.sum @@ -1609,16 +1609,16 @@ github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6Ac github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= -github.com/vulsio/go-cve-dictionary v0.8.2-0.20211013020338-ec22aa70ffdb h1:HTgus8EIfZiTvNTKd7JHZH+hwshKYXwCVoNMdmVi38M= -github.com/vulsio/go-cve-dictionary v0.8.2-0.20211013020338-ec22aa70ffdb/go.mod h1:Ii9TEH35giMSWJM2FwGm1PCPxuBKrbaYhDun2PM7ERo= -github.com/vulsio/go-exploitdb v0.4.2-0.20210930235136-c10d2716b7e2 h1:9qNocUoE2Ko2LJFWDIuDZOuo4KHMxksIpAWY3BAOCjM= -github.com/vulsio/go-exploitdb v0.4.2-0.20210930235136-c10d2716b7e2/go.mod h1:C1X/lRIvDDBWDeW19Msw7asZ4q0pFjmFx/kXGns2raA= -github.com/vulsio/go-msfdb v0.2.1-0.20211020031651-4347c01aab66 h1:77Ms/nkA8pB58fuwBOeiJNgKhjyWpm4pyVdwLup+Gns= -github.com/vulsio/go-msfdb v0.2.1-0.20211020031651-4347c01aab66/go.mod h1:NGdcwWxCK/ES8vZ/crzREqI69S5gH1MivCpSp1pa2Rc= -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-0.20211020012854-1ceb24aae1a7 h1:YS3DggefYXKg2SOFdd2a9BKiugZntSDtVCiolj3HJbA= -github.com/vulsio/goval-dictionary v0.6.1-0.20211020012854-1ceb24aae1a7/go.mod h1:drWHfa4y/l/GwiXJzNLTJSzugcI4O7SxdxFFxyuox1o= +github.com/vulsio/go-cve-dictionary v0.8.2-0.20211028094424-0a854f8e8f85 h1:nEhaBIAixxDQGeu/3sgHLSjpQpKGqENcUtWHEwkwC4k= +github.com/vulsio/go-cve-dictionary v0.8.2-0.20211028094424-0a854f8e8f85/go.mod h1:Ii9TEH35giMSWJM2FwGm1PCPxuBKrbaYhDun2PM7ERo= +github.com/vulsio/go-exploitdb v0.4.2-0.20211028071949-1ebf9c4f6c4d h1:iMXVmz2f1Phor1TAmRKx324mDOuXst0GXGEboVRgysg= +github.com/vulsio/go-exploitdb v0.4.2-0.20211028071949-1ebf9c4f6c4d/go.mod h1:2R5gwySHHjF3DoEt11xqnIWEJLS93CLfCUDPwYH+VdM= +github.com/vulsio/go-msfdb v0.2.1-0.20211028071756-4a9759bd9f14 h1:2uYZw2gQ0kymwerTS1FXZbNgptnlye+SB7o3QlLDIBo= +github.com/vulsio/go-msfdb v0.2.1-0.20211028071756-4a9759bd9f14/go.mod h1:NGdcwWxCK/ES8vZ/crzREqI69S5gH1MivCpSp1pa2Rc= +github.com/vulsio/gost v0.4.1-0.20211028071837-7ad032a6ffa8 h1:jqsECpLRp1EAXGOdhPxHzqYjWP5l980GjJ8s/AUYH/4= +github.com/vulsio/gost v0.4.1-0.20211028071837-7ad032a6ffa8/go.mod h1:DaWLus8dJ4DdhVsBe5TAEEZ3IdoTMIb/z2StR4Bhb7Q= +github.com/vulsio/goval-dictionary v0.6.1-0.20211028072035-e85e14b91ccc h1:YwPr8QCkg8d6ezmbo6P28dDyRtfbqbHpG6Q2i0I/rA0= +github.com/vulsio/goval-dictionary v0.6.1-0.20211028072035-e85e14b91ccc/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= diff --git a/gost/gost.go b/gost/gost.go index 77e43a2f..fd3ec208 100644 --- a/gost/gost.go +++ b/gost/gost.go @@ -88,7 +88,7 @@ func newGostDB(cnf config.GostConf) (driver db.DB, locked bool, err error) { if cnf.GetType() == "sqlite3" { path = cnf.GetSQLite3Path() } - if driver, locked, err = db.NewDB(cnf.GetType(), path, cnf.GetDebugSQL()); err != nil { + if driver, locked, err = db.NewDB(cnf.GetType(), path, cnf.GetDebugSQL(), db.Option{}); err != nil { if locked { return nil, true, xerrors.Errorf("gostDB is locked. err: %w", err) } diff --git a/oval/oval.go b/oval/oval.go index 5662cb44..78b36a17 100644 --- a/oval/oval.go +++ b/oval/oval.go @@ -122,7 +122,7 @@ func newOvalDB(cnf config.VulnDictInterface) (driver db.DB, err error) { path = cnf.GetSQLite3Path() } - driver, locked, err := db.NewDB(cnf.GetType(), path, cnf.GetDebugSQL()) + driver, locked, err := db.NewDB(cnf.GetType(), path, cnf.GetDebugSQL(), db.Option{}) if err != nil { if locked { err = xerrors.Errorf("SQLite3: %s is locked. err: %w", cnf.GetSQLite3Path(), err)