diff --git a/detector/cve_client.go b/detector/cve_client.go index 6fd44764..6d617e39 100644 --- a/detector/cve_client.go +++ b/detector/cve_client.go @@ -16,9 +16,9 @@ import ( "github.com/future-architect/vuls/config" "github.com/future-architect/vuls/logging" "github.com/future-architect/vuls/util" - cvedb "github.com/kotakanbe/go-cve-dictionary/db" - cvelog "github.com/kotakanbe/go-cve-dictionary/log" - cvemodels "github.com/kotakanbe/go-cve-dictionary/models" + cvedb "github.com/vulsio/go-cve-dictionary/db" + cvelog "github.com/vulsio/go-cve-dictionary/log" + cvemodels "github.com/vulsio/go-cve-dictionary/models" ) type goCveDictClient struct { diff --git a/detector/detector.go b/detector/detector.go index 6c49c8d2..3c05f0c5 100644 --- a/detector/detector.go +++ b/detector/detector.go @@ -18,7 +18,7 @@ import ( "github.com/future-architect/vuls/oval" "github.com/future-architect/vuls/reporter" "github.com/future-architect/vuls/util" - cvemodels "github.com/kotakanbe/go-cve-dictionary/models" + cvemodels "github.com/vulsio/go-cve-dictionary/models" "golang.org/x/xerrors" ) @@ -382,7 +382,7 @@ func detectPkgsCvesWithOval(cnf config.GovalDictConf, r *models.ScanResult) erro logging.Log.Infof("%s: %d CVEs are detected with OVAL", r.FormatServerName(), 0) return nil } - return xerrors.Errorf("OVAL entries of %s %s are not found. Fetch OVAL before reporting. For details, see `https://github.com/kotakanbe/goval-dictionary#usage`", r.Family, r.Release) + return xerrors.Errorf("OVAL entries of %s %s are not found. Fetch OVAL before reporting. For details, see `https://github.com/vulsio/goval-dictionary#usage`", r.Family, r.Release) } logging.Log.Debugf("Check if oval fresh: %s %s", r.Family, r.Release) diff --git a/detector/detector_test.go b/detector/detector_test.go index 1770c86c..8901c90b 100644 --- a/detector/detector_test.go +++ b/detector/detector_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/future-architect/vuls/models" - cvemodels "github.com/kotakanbe/go-cve-dictionary/models" + cvemodels "github.com/vulsio/go-cve-dictionary/models" ) func Test_getMaxConfidence(t *testing.T) { diff --git a/detector/msf.go b/detector/msf.go index 31c4a118..8017b5b8 100644 --- a/detector/msf.go +++ b/detector/msf.go @@ -7,8 +7,8 @@ import ( "github.com/future-architect/vuls/config" "github.com/future-architect/vuls/logging" "github.com/future-architect/vuls/models" - metasploitdb "github.com/takuzoo3868/go-msfdb/db" - metasploitmodels "github.com/takuzoo3868/go-msfdb/models" + metasploitdb "github.com/vulsio/go-msfdb/db" + metasploitmodels "github.com/vulsio/go-msfdb/models" "golang.org/x/xerrors" ) diff --git a/detector/util.go b/detector/util.go index 1f5083a2..5a8a54eb 100644 --- a/detector/util.go +++ b/detector/util.go @@ -145,7 +145,7 @@ func getPlusDiffCves(previous, current models.ScanResult) models.VulnInfos { // TODO commented out because a bug of diff logic when multiple oval defs found for a certain CVE-ID and same updated_at // if these OVAL defs have different affected packages, this logic detects as updated. - // This logic will be uncomented after integration with gost https://github.com/knqyf263/gost + // This logic will be uncomented after integration with gost https://github.com/vulsio/gost // } else if isCveFixed(v, previous) { // updated[v.CveID] = v // logging.Log.Debugf("fixed: %s", v.CveID) diff --git a/go.mod b/go.mod index 32c55a43..cd2a1cae 100644 --- a/go.mod +++ b/go.mod @@ -35,10 +35,7 @@ require ( github.com/knqyf263/go-cpe v0.0.0-20201213041631-54f6ab28673f github.com/knqyf263/go-deb-version v0.0.0-20190517075300-09fca494f03d github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936 - github.com/knqyf263/gost v0.2.0 - github.com/kotakanbe/go-cve-dictionary v0.7.2-0.20210907024016-69922490c76a github.com/kotakanbe/go-pingscanner v0.1.0 - github.com/kotakanbe/goval-dictionary v0.5.0 github.com/kotakanbe/logrus-prefixed-formatter v0.0.0-20180123152602-928f7356cb96 github.com/mattn/go-isatty v0.0.14 // indirect github.com/mattn/go-runewidth v0.0.13 // indirect @@ -54,8 +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/takuzoo3868/go-msfdb v0.1.6 + github.com/vulsio/go-cve-dictionary v0.8.1-0.20210916000615-947df305878a github.com/vulsio/go-exploitdb v0.2.0 + github.com/vulsio/go-msfdb v0.2.0 + github.com/vulsio/gost v0.3.0 + github.com/vulsio/goval-dictionary v0.6.0 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect golang.org/x/net v0.0.0-20210902165921-8d991716f632 // indirect golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c @@ -79,6 +79,8 @@ require ( github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver v1.5.0 // indirect github.com/Masterminds/sprig v2.22.0+incompatible // indirect + github.com/PuerkitoBio/goquery v1.6.1 // indirect + github.com/andybalholm/cascadia v1.2.0 // indirect github.com/aquasecurity/go-dep-parser v0.0.0-20210815080135-5be65146849a // indirect github.com/aquasecurity/go-gem-version v0.0.0-20201115065557-8eed6fe000ce // indirect github.com/aquasecurity/go-npm-version v0.0.0-20201110091526-0b796d180798 // indirect diff --git a/go.sum b/go.sum index 3e996287..7f04bef1 100644 --- a/go.sum +++ b/go.sum @@ -159,6 +159,7 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= +github.com/PuerkitoBio/goquery v1.6.1 h1:FgjbQZKl5HTmcn4sKBgvx8vv63nhyhIpv7lJpFGCWpk= github.com/PuerkitoBio/goquery v1.6.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= @@ -190,6 +191,7 @@ github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:C github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= github.com/alicebob/miniredis/v2 v2.14.1/go.mod h1:uS970Sw5Gs9/iK3yBg0l9Uj9s25wXxSpQUE9EaJ/Blg= github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= +github.com/andybalholm/cascadia v1.2.0 h1:vuRCkM5Ozh/BfmsaTm26kbjm0mIOM3yS5Ek/F5h18aE= github.com/andybalholm/cascadia v1.2.0/go.mod h1:YCyR8vOZT9aZ1CHEd8ap0gMVm2aFgxBp0T0eFw1RUQY= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= @@ -1039,19 +1041,13 @@ github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936 h1:HDjRqot github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936/go.mod h1:i4sF0l1fFnY1aiw08QQSwVAFxHEm311Me3WsU/X7nL0= github.com/knqyf263/go-rpmdb v0.0.0-20201215100354-a9e3110d8ee1 h1:sRDvjjWoHLWAxtPXBKYRJp8Ot4ugxYE/ZyADl3jzc1g= github.com/knqyf263/go-rpmdb v0.0.0-20201215100354-a9e3110d8ee1/go.mod h1:RDPNeIkU5NWXtt0OMEoILyxwUC/DyXeRtK295wpqSi0= -github.com/knqyf263/gost v0.2.0 h1:A62Kzj7+0T5/TdAAwDH6uK5HfffN+6h/wClX5lTSzZ8= -github.com/knqyf263/gost v0.2.0/go.mod h1:VgcvOkxaqKbf695UyQrNFKMPQgWChNlGUnJbw8kmET8= github.com/knqyf263/nested v0.0.1 h1:Sv26CegUMhjt19zqbBKntjwESdxe5hxVPSk0+AKjdUc= github.com/knqyf263/nested v0.0.1/go.mod h1:zwhsIhMkBg90DTOJQvxPkKIypEHPYkgWHs4gybdlUmk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kotakanbe/go-cve-dictionary v0.7.2-0.20210907024016-69922490c76a h1:HUwjOw0HR81RHXdgQG0clhs88HCWvbN9bjOUMPL1xE0= -github.com/kotakanbe/go-cve-dictionary v0.7.2-0.20210907024016-69922490c76a/go.mod h1:RRZTNWQL6KVchGwK/444079s/GipyVAzIyjuzgWw5IQ= github.com/kotakanbe/go-pingscanner v0.1.0 h1:VG4/9l0i8WeToXclj7bIGoAZAu7a07Z3qmQiIfU0gT0= github.com/kotakanbe/go-pingscanner v0.1.0/go.mod h1:/761QZzuZFcfN8h/1QuawUA+pKukp3qcNj5mxJCOiAk= -github.com/kotakanbe/goval-dictionary v0.5.0 h1:tPoFakaDpBNGVTGxgN2p480AgatGX/zTpV2Hn89+7lQ= -github.com/kotakanbe/goval-dictionary v0.5.0/go.mod h1:uAjJlvCvL5TCABKFhOT4BgwIar3LRVhS+Q3BGTsiv3o= github.com/kotakanbe/logrus-prefixed-formatter v0.0.0-20180123152602-928f7356cb96 h1:xNVK0mQJdQjw+QYeaMM4G6fvucWr8rTGGIhlPakx1wU= github.com/kotakanbe/logrus-prefixed-formatter v0.0.0-20180123152602-928f7356cb96/go.mod h1:ljq48H1V+0Vh0u7ucA3LjR4AfkAeCpxrf7LaaCk8Vmo= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= @@ -1230,7 +1226,6 @@ github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtb github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -1483,7 +1478,6 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44= github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= @@ -1511,8 +1505,6 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69 github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/takuzoo3868/go-msfdb v0.1.6 h1:iIXQ3lsqfiME4n8Pi6NnP7hxAgMDr/HUmFzNrx3rkk8= -github.com/takuzoo3868/go-msfdb v0.1.6/go.mod h1:x9dCeDZRn6Glsjpmuh0AuIU602u+7MqejfbWwxmZDCg= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= @@ -1572,8 +1564,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.1-0.20210916000615-947df305878a h1:IGhdylaTYl0Xhn11gfLpX86TqZ91JofFbvEV1+sbKNA= +github.com/vulsio/go-cve-dictionary v0.8.1-0.20210916000615-947df305878a/go.mod h1:PdkEViYpf0sx4H0YF7Sk/Xo+j8Agof4aOVoQxzL+TQA= github.com/vulsio/go-exploitdb v0.2.0 h1:+PdCXcMiJo8ewMCkqikuJsgkPQeYUdvyBYrAnlNDXec= github.com/vulsio/go-exploitdb v0.2.0/go.mod h1:Vx0zR1HMR3wyhiYctNuADxBVPxMcfCNZpmP72d26hZU= +github.com/vulsio/go-msfdb v0.2.0 h1:VY0vnQEgYB4eRwvK8yio1Tz5Yn5l7GJSh3mnUJEPceM= +github.com/vulsio/go-msfdb v0.2.0/go.mod h1:QsHhtjF4hAheLgeGJQRv/ccmE3txtOSgwzTgziyStKY= +github.com/vulsio/gost v0.3.0 h1:oRgIAi3SR9AFZS12vuaqx0TXFhTxSyp6MQX8XV41a6w= +github.com/vulsio/gost v0.3.0/go.mod h1:bCyU8JTDE+C2pRRM1PArrFdbd2dELH9S+NKKio9jvac= +github.com/vulsio/goval-dictionary v0.6.0 h1:P+4Bni+quaeHc19ESD3MJQOHFVYvraNris8AYOA2oC8= +github.com/vulsio/goval-dictionary v0.6.0/go.mod h1:RU1jWunEAwnErgIbM5Hc2j4OnTHQEvMagBq6/6wfWPU= 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= @@ -2273,7 +2273,6 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.0.6/go.mod h1:KdrTanmfLPPyAOeYGyG+UpDys7/7eeWT1zCq+oekYnU= diff --git a/gost/debian.go b/gost/debian.go index e289b0a1..16f0a2be 100644 --- a/gost/debian.go +++ b/gost/debian.go @@ -10,7 +10,7 @@ import ( "github.com/future-architect/vuls/models" "github.com/future-architect/vuls/util" debver "github.com/knqyf263/go-deb-version" - gostmodels "github.com/knqyf263/gost/models" + gostmodels "github.com/vulsio/gost/models" "golang.org/x/xerrors" ) diff --git a/gost/gost.go b/gost/gost.go index 91d31da7..77e43a2f 100644 --- a/gost/gost.go +++ b/gost/gost.go @@ -7,7 +7,7 @@ import ( "github.com/future-architect/vuls/config" "github.com/future-architect/vuls/logging" "github.com/future-architect/vuls/models" - "github.com/knqyf263/gost/db" + "github.com/vulsio/gost/db" "golang.org/x/xerrors" "github.com/future-architect/vuls/constant" diff --git a/gost/gost_test.go b/gost/gost_test.go index 57b35ff5..b25c9830 100644 --- a/gost/gost_test.go +++ b/gost/gost_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/future-architect/vuls/models" - gostmodels "github.com/knqyf263/gost/models" + gostmodels "github.com/vulsio/gost/models" ) func TestSetPackageStates(t *testing.T) { diff --git a/gost/microsoft.go b/gost/microsoft.go index e0d04113..473bcaa1 100644 --- a/gost/microsoft.go +++ b/gost/microsoft.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/future-architect/vuls/models" - gostmodels "github.com/knqyf263/gost/models" + gostmodels "github.com/vulsio/gost/models" ) // Microsoft is Gost client for windows diff --git a/gost/redhat.go b/gost/redhat.go index 3471f653..1e51b882 100644 --- a/gost/redhat.go +++ b/gost/redhat.go @@ -11,7 +11,7 @@ import ( "github.com/future-architect/vuls/config" "github.com/future-architect/vuls/models" "github.com/future-architect/vuls/util" - gostmodels "github.com/knqyf263/gost/models" + gostmodels "github.com/vulsio/gost/models" ) // RedHat is Gost client for RedHat family linux diff --git a/gost/ubuntu.go b/gost/ubuntu.go index 0646cc61..e05ac5a7 100644 --- a/gost/ubuntu.go +++ b/gost/ubuntu.go @@ -10,7 +10,7 @@ import ( "github.com/future-architect/vuls/logging" "github.com/future-architect/vuls/models" "github.com/future-architect/vuls/util" - gostmodels "github.com/knqyf263/gost/models" + gostmodels "github.com/vulsio/gost/models" ) // Ubuntu is Gost client for Ubuntu diff --git a/gost/ubuntu_test.go b/gost/ubuntu_test.go index 0f496f0e..03701a93 100644 --- a/gost/ubuntu_test.go +++ b/gost/ubuntu_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/future-architect/vuls/models" - gostmodels "github.com/knqyf263/gost/models" + gostmodels "github.com/vulsio/gost/models" ) func TestUbuntu_Supported(t *testing.T) { diff --git a/integration/data/results/amazon_2.json b/integration/data/results/amazon_2.json index 87f9911a..a82883a6 100755 --- a/integration/data/results/amazon_2.json +++ b/integration/data/results/amazon_2.json @@ -6469,13 +6469,13 @@ "cveDict": { "Name": "cveDict", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/kotakanbe/go-cve-dictionary/cve.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/go-cve-dictionary/cve.sqlite3", "DebugSQL": false }, "ovalDict": { "Name": "ovalDict", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/kotakanbe/goval-dictionary/oval.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/goval-dictionary/oval.sqlite3", "DebugSQL": false }, "gost": { @@ -6493,7 +6493,7 @@ "metasploit": { "Name": "metasploit", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/takuzoo3868/go-msfdb/go-msfdb.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/go-msfdb/go-msfdb.sqlite3", "DebugSQL": false } }, diff --git a/integration/data/results/centos_7.json b/integration/data/results/centos_7.json index bf5abc9f..91d85d93 100755 --- a/integration/data/results/centos_7.json +++ b/integration/data/results/centos_7.json @@ -5569,13 +5569,13 @@ "cveDict": { "Name": "cveDict", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/kotakanbe/go-cve-dictionary/cve.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/go-cve-dictionary/cve.sqlite3", "DebugSQL": false }, "ovalDict": { "Name": "ovalDict", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/kotakanbe/goval-dictionary/oval.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/goval-dictionary/oval.sqlite3", "DebugSQL": false }, "gost": { @@ -5593,7 +5593,7 @@ "metasploit": { "Name": "metasploit", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/takuzoo3868/go-msfdb/go-msfdb.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/go-msfdb/go-msfdb.sqlite3", "DebugSQL": false } }, diff --git a/integration/data/results/debian_10.json b/integration/data/results/debian_10.json index 0fa35dd6..d847766f 100755 --- a/integration/data/results/debian_10.json +++ b/integration/data/results/debian_10.json @@ -5566,13 +5566,13 @@ "cveDict": { "Name": "cveDict", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/kotakanbe/go-cve-dictionary/cve.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/go-cve-dictionary/cve.sqlite3", "DebugSQL": false }, "ovalDict": { "Name": "ovalDict", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/kotakanbe/goval-dictionary/oval.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/goval-dictionary/oval.sqlite3", "DebugSQL": false }, "gost": { @@ -5590,7 +5590,7 @@ "metasploit": { "Name": "metasploit", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/takuzoo3868/go-msfdb/go-msfdb.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/go-msfdb/go-msfdb.sqlite3", "DebugSQL": false } }, diff --git a/integration/data/results/rhel_71.json b/integration/data/results/rhel_71.json index 699a504e..5665c694 100755 --- a/integration/data/results/rhel_71.json +++ b/integration/data/results/rhel_71.json @@ -5093,13 +5093,13 @@ "cveDict": { "Name": "cveDict", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/kotakanbe/go-cve-dictionary/cve.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/go-cve-dictionary/cve.sqlite3", "DebugSQL": false }, "ovalDict": { "Name": "ovalDict", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/kotakanbe/goval-dictionary/oval.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/goval-dictionary/oval.sqlite3", "DebugSQL": false }, "gost": { @@ -5117,7 +5117,7 @@ "metasploit": { "Name": "metasploit", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/takuzoo3868/go-msfdb/go-msfdb.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/go-msfdb/go-msfdb.sqlite3", "DebugSQL": false } }, diff --git a/integration/data/results/rhel_8.json b/integration/data/results/rhel_8.json index f1cefe5b..3116d074 100755 --- a/integration/data/results/rhel_8.json +++ b/integration/data/results/rhel_8.json @@ -6871,13 +6871,13 @@ "cveDict": { "Name": "cveDict", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/kotakanbe/go-cve-dictionary/cve.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/go-cve-dictionary/cve.sqlite3", "DebugSQL": false }, "ovalDict": { "Name": "ovalDict", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/kotakanbe/goval-dictionary/oval.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/goval-dictionary/oval.sqlite3", "DebugSQL": false }, "gost": { @@ -6895,7 +6895,7 @@ "metasploit": { "Name": "metasploit", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/takuzoo3868/go-msfdb/go-msfdb.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/go-msfdb/go-msfdb.sqlite3", "DebugSQL": false } }, diff --git a/integration/data/results/ubuntu_1804.json b/integration/data/results/ubuntu_1804.json index 5e3de5ec..649c5452 100755 --- a/integration/data/results/ubuntu_1804.json +++ b/integration/data/results/ubuntu_1804.json @@ -8544,13 +8544,13 @@ "cveDict": { "Name": "cveDict", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/kotakanbe/go-cve-dictionary/cve.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/go-cve-dictionary/cve.sqlite3", "DebugSQL": false }, "ovalDict": { "Name": "ovalDict", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/kotakanbe/goval-dictionary/oval.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/goval-dictionary/oval.sqlite3", "DebugSQL": false }, "gost": { @@ -8568,7 +8568,7 @@ "metasploit": { "Name": "metasploit", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/takuzoo3868/go-msfdb/go-msfdb.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/go-msfdb/go-msfdb.sqlite3", "DebugSQL": false } }, diff --git a/integration/data/results/ubuntu_2004.json b/integration/data/results/ubuntu_2004.json index 1bc52032..58cc5672 100755 --- a/integration/data/results/ubuntu_2004.json +++ b/integration/data/results/ubuntu_2004.json @@ -8494,13 +8494,13 @@ "cveDict": { "Name": "cveDict", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/kotakanbe/go-cve-dictionary/cve.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/go-cve-dictionary/cve.sqlite3", "DebugSQL": false }, "ovalDict": { "Name": "ovalDict", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/kotakanbe/goval-dictionary/oval.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/goval-dictionary/oval.sqlite3", "DebugSQL": false }, "gost": { @@ -8518,7 +8518,7 @@ "metasploit": { "Name": "metasploit", "Type": "sqlite3", - "SQLite3Path": "/home/ubuntu/go/src/github.com/takuzoo3868/go-msfdb/go-msfdb.sqlite3", + "SQLite3Path": "/home/ubuntu/go/src/github.com/vulsio/go-msfdb/go-msfdb.sqlite3", "DebugSQL": false } }, diff --git a/models/utils.go b/models/utils.go index cbd36e65..1817bf23 100644 --- a/models/utils.go +++ b/models/utils.go @@ -6,7 +6,7 @@ package models import ( "strings" - cvedict "github.com/kotakanbe/go-cve-dictionary/models" + cvedict "github.com/vulsio/go-cve-dictionary/models" ) // ConvertJvnToModel convert JVN to CveContent diff --git a/oval/debian.go b/oval/debian.go index ef0ffc10..da3b3a1b 100644 --- a/oval/debian.go +++ b/oval/debian.go @@ -12,7 +12,7 @@ import ( "github.com/future-architect/vuls/logging" "github.com/future-architect/vuls/models" "github.com/future-architect/vuls/util" - ovalmodels "github.com/kotakanbe/goval-dictionary/models" + ovalmodels "github.com/vulsio/goval-dictionary/models" ) // DebianBase is the base struct of Debian and Ubuntu diff --git a/oval/debian_test.go b/oval/debian_test.go index 6f52afad..6be5df06 100644 --- a/oval/debian_test.go +++ b/oval/debian_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/future-architect/vuls/models" - ovalmodels "github.com/kotakanbe/goval-dictionary/models" + ovalmodels "github.com/vulsio/goval-dictionary/models" ) func TestPackNamesOfUpdateDebian(t *testing.T) { diff --git a/oval/oval.go b/oval/oval.go index 7888521d..73c14f5d 100644 --- a/oval/oval.go +++ b/oval/oval.go @@ -11,8 +11,8 @@ import ( "github.com/future-architect/vuls/logging" "github.com/future-architect/vuls/models" "github.com/future-architect/vuls/util" - "github.com/kotakanbe/goval-dictionary/db" "github.com/parnurzeal/gorequest" + "github.com/vulsio/goval-dictionary/db" "golang.org/x/xerrors" ) @@ -103,7 +103,7 @@ func (b Base) CheckIfOvalFresh(osFamily, release string) (ok bool, err error) { since := time.Now() since = since.AddDate(0, 0, -3) if lastModified.Before(since) { - logging.Log.Warnf("OVAL for %s %s is old, last modified is %s. It's recommended to update OVAL to improve scanning accuracy. How to update OVAL database, see https://github.com/kotakanbe/goval-dictionary#usage", + logging.Log.Warnf("OVAL for %s %s is old, last modified is %s. It's recommended to update OVAL to improve scanning accuracy. How to update OVAL database, see https://github.com/vulsio/goval-dictionary#usage", osFamily, release, lastModified) return false, nil } diff --git a/oval/redhat.go b/oval/redhat.go index f99dd600..1efb01fc 100644 --- a/oval/redhat.go +++ b/oval/redhat.go @@ -12,7 +12,7 @@ import ( "github.com/future-architect/vuls/constant" "github.com/future-architect/vuls/logging" "github.com/future-architect/vuls/models" - ovalmodels "github.com/kotakanbe/goval-dictionary/models" + ovalmodels "github.com/vulsio/goval-dictionary/models" ) // RedHatBase is the base struct for RedHat, CentOS, Alma and Rocky diff --git a/oval/redhat_test.go b/oval/redhat_test.go index f4386a15..2f7e3359 100644 --- a/oval/redhat_test.go +++ b/oval/redhat_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/future-architect/vuls/models" - ovalmodels "github.com/kotakanbe/goval-dictionary/models" + ovalmodels "github.com/vulsio/goval-dictionary/models" ) func TestParseCvss2(t *testing.T) { diff --git a/oval/suse.go b/oval/suse.go index 463b3a53..fcfdcdb1 100644 --- a/oval/suse.go +++ b/oval/suse.go @@ -8,7 +8,7 @@ import ( "github.com/future-architect/vuls/constant" "github.com/future-architect/vuls/logging" "github.com/future-architect/vuls/models" - ovalmodels "github.com/kotakanbe/goval-dictionary/models" + ovalmodels "github.com/vulsio/goval-dictionary/models" ) // SUSE is the struct of SUSE Linux diff --git a/oval/util.go b/oval/util.go index 9bc2a145..569bcef8 100644 --- a/oval/util.go +++ b/oval/util.go @@ -20,9 +20,9 @@ import ( apkver "github.com/knqyf263/go-apk-version" debver "github.com/knqyf263/go-deb-version" rpmver "github.com/knqyf263/go-rpm-version" - "github.com/kotakanbe/goval-dictionary/db" - ovalmodels "github.com/kotakanbe/goval-dictionary/models" "github.com/parnurzeal/gorequest" + "github.com/vulsio/goval-dictionary/db" + ovalmodels "github.com/vulsio/goval-dictionary/models" "golang.org/x/xerrors" ) diff --git a/oval/util_test.go b/oval/util_test.go index b28a34b7..18c1c0bb 100644 --- a/oval/util_test.go +++ b/oval/util_test.go @@ -10,7 +10,7 @@ import ( "github.com/future-architect/vuls/constant" "github.com/future-architect/vuls/models" - ovalmodels "github.com/kotakanbe/goval-dictionary/models" + ovalmodels "github.com/vulsio/goval-dictionary/models" ) func TestUpsert(t *testing.T) { diff --git a/reporter/util.go b/reporter/util.go index 871abc55..f37891ba 100644 --- a/reporter/util.go +++ b/reporter/util.go @@ -621,7 +621,7 @@ func getPlusDiffCves(previous, current models.ScanResult) models.VulnInfos { // TODO commented out because a bug of diff logic when multiple oval defs found for a certain CVE-ID and same updated_at // if these OVAL defs have different affected packages, this logic detects as updated. - // This logic will be uncomented after integration with gost https://github.com/knqyf263/gost + // This logic will be uncomented after integration with gost https://github.com/vulsio/gost // } else if isCveFixed(v, previous) { // updated[v.CveID] = v // logging.Log.Debugf("fixed: %s", v.CveID)