diff --git a/.gitignore b/.gitignore index cdfc9a7..ca23031 100644 --- a/.gitignore +++ b/.gitignore @@ -17,5 +17,5 @@ coverage.txt assets cache -# vulcheck-db Outputs -vulcheck-db +# vul-db Outputs +vul-db diff --git a/go.mod b/go.mod index ee4a67d..dc1be90 100644 --- a/go.mod +++ b/go.mod @@ -3,36 +3,39 @@ module github.com/khulnasoft-labs/vul-db go 1.19 require ( - github.com/briandowns/spinner v1.23.0 // indirect + github.com/briandowns/spinner v1.23.0 + github.com/hashicorp/go-version v1.6.0 + github.com/khulnasoft-labs/boltdb-fixtures v0.0.0-20230802024017-3c3ec93cba21 + github.com/knqyf263/go-deb-version v0.0.0-20230223133812-3ed183d23422 + github.com/knqyf263/go-rpm-version v0.0.0-20220614171824-631e686d1075 + github.com/samber/lo v1.38.1 + github.com/stretchr/testify v1.8.4 + github.com/urfave/cli v1.22.14 + go.etcd.io/bbolt v1.3.7 + go.uber.org/zap v1.24.0 + golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b + golang.org/x/text v0.11.0 + golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 + gopkg.in/cheggaaa/pb.v1 v1.0.28 + gopkg.in/yaml.v2 v2.4.0 + k8s.io/utils v0.0.0-20230726121419-3b25d923346b +) + +require ( github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fatih/color v1.10.0 // indirect github.com/goccy/go-yaml v1.11.0 // indirect - github.com/hashicorp/go-version v1.6.0 // indirect - github.com/khulnasoft-labs/boltdb-fixtures v0.0.0-20230802024017-3c3ec93cba21 // indirect - github.com/knqyf263/go-deb-version v0.0.0-20230223133812-3ed183d23422 // indirect - github.com/knqyf263/go-rpm-version v0.0.0-20220614171824-631e686d1075 // indirect github.com/mattn/go-colorable v0.1.8 // indirect github.com/mattn/go-isatty v0.0.12 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rivo/uniseg v0.2.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/samber/lo v1.38.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - github.com/stretchr/testify v1.8.4 // indirect - github.com/urfave/cli v1.22.14 // indirect - go.etcd.io/bbolt v1.3.7 // indirect go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect - go.uber.org/zap v1.24.0 // indirect - golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b // indirect golang.org/x/sys v0.6.0 // indirect golang.org/x/term v0.6.0 // indirect - golang.org/x/text v0.11.0 // indirect - golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect ) diff --git a/go.sum b/go.sum index d5bd955..e609221 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,5 @@ github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/briandowns/spinner v1.23.0 h1:alDF2guRWqa/FOZZYWjlMIx2L6H0wyewPxo/CH4Pt2A= github.com/briandowns/spinner v1.23.0/go.mod h1:rPG4gmXeN3wQV/TsAY4w8lPdIM6RX3yqeBQJSrbXjuE= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= @@ -6,16 +7,18 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= github.com/goccy/go-yaml v1.11.0 h1:n7Z+zx8S9f9KgzG6KtQKf+kwqXZlLNR2F6018Dgau54= github.com/goccy/go-yaml v1.11.0/go.mod h1:H+mJrWtjPTJAHvRbV09MCK9xYwODM+wRTVFFTWckfng= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= @@ -25,17 +28,15 @@ github.com/knqyf263/go-deb-version v0.0.0-20230223133812-3ed183d23422 h1:PPPlUUq github.com/knqyf263/go-deb-version v0.0.0-20230223133812-3ed183d23422/go.mod h1:ijAmSS4jErO6+KRzcK6ixsm3Vt96hMhJ+W+x+VmbrQA= github.com/knqyf263/go-rpm-version v0.0.0-20220614171824-631e686d1075 h1:aC6MEAs3PE3lWD7lqrJfDxHd6hcced9R4JTZu85cJwU= github.com/knqyf263/go-rpm-version v0.0.0-20220614171824-631e686d1075/go.mod h1:i4sF0l1fFnY1aiw08QQSwVAFxHEm311Me3WsU/X7nL0= +github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= -github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU= -github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= @@ -63,6 +64,7 @@ go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= go.etcd.io/gofail v0.1.0/go.mod h1:VZBCXYGZhHAinaBiiqYvuDynvahNsAyLFwB3kEHKz1M= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= @@ -70,6 +72,7 @@ go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b h1:r+vk0EmXNmekl0S0BascoeeoHk/L7wmaW2QF90K+kYI= golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= @@ -85,25 +88,19 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw= -golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= @@ -123,6 +120,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk= gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= diff --git a/pkg/db/advisory.go b/pkg/db/advisory.go index 6ec57f1..07901bf 100644 --- a/pkg/db/advisory.go +++ b/pkg/db/advisory.go @@ -3,7 +3,7 @@ package db import ( "encoding/json" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/types" bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" ) diff --git a/pkg/db/advisory_detail_test.go b/pkg/db/advisory_detail_test.go index 48f50dd..ab874d4 100644 --- a/pkg/db/advisory_detail_test.go +++ b/pkg/db/advisory_detail_test.go @@ -5,13 +5,13 @@ import ( bolt "go.etcd.io/bbolt" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/dbtest" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/dbtest" ) func TestConfig_SaveAdvisoryDetails(t *testing.T) { diff --git a/pkg/db/advisory_test.go b/pkg/db/advisory_test.go index b1e21b5..20a3e8b 100644 --- a/pkg/db/advisory_test.go +++ b/pkg/db/advisory_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/dbtest" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/dbtest" + "github.com/khulnasoft-labs/vul-db/pkg/types" ) func TestConfig_ForEachAdvisory(t *testing.T) { diff --git a/pkg/db/data_source.go b/pkg/db/data_source.go index 6a0089a..8b2a8f1 100644 --- a/pkg/db/data_source.go +++ b/pkg/db/data_source.go @@ -3,7 +3,7 @@ package db import ( "encoding/json" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/types" bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" diff --git a/pkg/db/db.go b/pkg/db/db.go index a347ecc..04912d2 100644 --- a/pkg/db/db.go +++ b/pkg/db/db.go @@ -11,8 +11,8 @@ import ( bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/log" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/log" + "github.com/khulnasoft-labs/vul-db/pkg/types" ) type CustomPut func(dbc Operation, tx *bolt.Tx, adv interface{}) error @@ -90,7 +90,7 @@ func Dir(cacheDir string) string { } func Path(cacheDir string) string { - dbPath := filepath.Join(Dir(cacheDir), "vulcheck.db") + dbPath := filepath.Join(Dir(cacheDir), "vul.db") return dbPath } diff --git a/pkg/db/db_test.go b/pkg/db/db_test.go index 64799aa..ce27a45 100644 --- a/pkg/db/db_test.go +++ b/pkg/db/db_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/db" "github.com/stretchr/testify/require" ) diff --git a/pkg/db/mock_operation.go b/pkg/db/mock_operation.go index 14ecdf2..14329d9 100644 --- a/pkg/db/mock_operation.go +++ b/pkg/db/mock_operation.go @@ -3,7 +3,7 @@ package db import ( - types "github.com/khulnasoft-labs/vulcheck-db/pkg/types" + types "github.com/khulnasoft-labs/vul-db/pkg/types" mock "github.com/stretchr/testify/mock" bbolt "go.etcd.io/bbolt" ) diff --git a/pkg/db/redhat_cpe_test.go b/pkg/db/redhat_cpe_test.go index 4a620d9..3057411 100644 --- a/pkg/db/redhat_cpe_test.go +++ b/pkg/db/redhat_cpe_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/dbtest" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/dbtest" ) func TestConfig_GetRedHatCPEs(t *testing.T) { diff --git a/pkg/db/vulnerability.go b/pkg/db/vulnerability.go index 44a26ae..8e8dfce 100644 --- a/pkg/db/vulnerability.go +++ b/pkg/db/vulnerability.go @@ -3,7 +3,7 @@ package db import ( "encoding/json" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/types" bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" diff --git a/pkg/db/vulnerability_detail.go b/pkg/db/vulnerability_detail.go index 832127e..1788ada 100644 --- a/pkg/db/vulnerability_detail.go +++ b/pkg/db/vulnerability_detail.go @@ -3,7 +3,7 @@ package db import ( "encoding/json" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/types" bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" diff --git a/pkg/dbtest/init.go b/pkg/dbtest/init.go index 3272099..aef873a 100644 --- a/pkg/dbtest/init.go +++ b/pkg/dbtest/init.go @@ -6,7 +6,7 @@ import ( "testing" fixtures "github.com/khulnasoft-labs/boltdb-fixtures" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/db" "github.com/stretchr/testify/require" ) diff --git a/pkg/metadata/metadata.go b/pkg/metadata/metadata.go index 4cc13ae..3d34e57 100644 --- a/pkg/metadata/metadata.go +++ b/pkg/metadata/metadata.go @@ -8,7 +8,7 @@ import ( "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/db" ) const metadataFile = "metadata.json" diff --git a/pkg/types/types.go b/pkg/types/types.go index 3953f57..1571d74 100644 --- a/pkg/types/types.go +++ b/pkg/types/types.go @@ -105,7 +105,7 @@ type Advisory struct { // e.g. Will not fix and Affected Status Status `json:"-"` - // Vulcheck DB has "vulnerability" bucket and severities are usually stored in the bucket per a vulnerability ID. + // Vul DB has "vulnerability" bucket and severities are usually stored in the bucket per a vulnerability ID. // In some cases, the advisory may have multiple severities depending on the packages. // For example, CVE-2015-2328 in Debian has "unimportant" for mongodb and "low" for pcre3. // e.g. https://security-tracker.debian.org/tracker/CVE-2015-2328 diff --git a/pkg/utils/ints/ints_test.go b/pkg/utils/ints/ints_test.go index 55bc3a2..4095b51 100644 --- a/pkg/utils/ints/ints_test.go +++ b/pkg/utils/ints/ints_test.go @@ -3,7 +3,7 @@ package ints_test import ( "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils/ints" + "github.com/khulnasoft-labs/vul-db/pkg/utils/ints" "github.com/stretchr/testify/assert" ) diff --git a/pkg/utils/strings/strings_test.go b/pkg/utils/strings/strings_test.go index 3ec0614..4757652 100644 --- a/pkg/utils/strings/strings_test.go +++ b/pkg/utils/strings/strings_test.go @@ -3,7 +3,7 @@ package strings_test import ( "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils/strings" + "github.com/khulnasoft-labs/vul-db/pkg/utils/strings" "github.com/stretchr/testify/assert" ) diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 5203e4c..67f7397 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -11,7 +11,7 @@ func CacheDir() string { if err != nil { tmpDir = os.TempDir() } - return filepath.Join(tmpDir, "vulcheck-db") + return filepath.Join(tmpDir, "vul-db") } func ConstructVersion(epoch, version, release string) string { diff --git a/pkg/vulndb/db.go b/pkg/vulndb/db.go index 7610d95..499b291 100644 --- a/pkg/vulndb/db.go +++ b/pkg/vulndb/db.go @@ -8,18 +8,18 @@ import ( "golang.org/x/xerrors" "k8s.io/utils/clock" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/metadata" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/metadata" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) type VulnDB interface { Build(targets []string) error } -type VulcheckDB struct { +type VulDB struct { dbc db.Config metadata metadata.Client vulnClient vulnerability.Vulnerability @@ -29,21 +29,21 @@ type VulcheckDB struct { clock clock.Clock } -type Option func(*VulcheckDB) +type Option func(*VulDB) func WithClock(clock clock.Clock) Option { - return func(core *VulcheckDB) { + return func(core *VulDB) { core.clock = clock } } func WithVulnSrcs(srcs map[types.SourceID]vulnsrc.VulnSrc) Option { - return func(core *VulcheckDB) { + return func(core *VulDB) { core.vulnSrcs = srcs } } -func New(cacheDir string, updateInterval time.Duration, opts ...Option) *VulcheckDB { +func New(cacheDir string, updateInterval time.Duration, opts ...Option) *VulDB { // Initialize map vulnSrcs := map[types.SourceID]vulnsrc.VulnSrc{} for _, v := range vulnsrc.All { @@ -51,7 +51,7 @@ func New(cacheDir string, updateInterval time.Duration, opts ...Option) *Vulchec } dbc := db.Config{} - tdb := &VulcheckDB{ + tdb := &VulDB{ dbc: dbc, metadata: metadata.NewClient(cacheDir), vulnClient: vulnerability.New(dbc), @@ -68,7 +68,7 @@ func New(cacheDir string, updateInterval time.Duration, opts ...Option) *Vulchec return tdb } -func (t VulcheckDB) Insert(targets []string) error { +func (t VulDB) Insert(targets []string) error { log.Println("Updating vulnerability database...") for _, target := range targets { src, ok := t.vulnSrc(target) @@ -95,7 +95,7 @@ func (t VulcheckDB) Insert(targets []string) error { return nil } -func (t VulcheckDB) Build(targets []string) error { +func (t VulDB) Build(targets []string) error { // Insert all security advisories if err := t.Insert(targets); err != nil { return xerrors.Errorf("insert error: %w", err) @@ -114,7 +114,7 @@ func (t VulcheckDB) Build(targets []string) error { return nil } -func (t VulcheckDB) vulnSrc(target string) (vulnsrc.VulnSrc, bool) { +func (t VulDB) vulnSrc(target string) (vulnsrc.VulnSrc, bool) { for _, src := range t.vulnSrcs { if target == string(src.Name()) { return src, true @@ -123,9 +123,9 @@ func (t VulcheckDB) vulnSrc(target string) (vulnsrc.VulnSrc, bool) { return nil, false } -func (t VulcheckDB) optimize() error { +func (t VulDB) optimize() error { // NVD also contains many vulnerabilities that are not related to OS packages or language-specific packages. - // Vulcheck DB will not store them so that it could reduce the database size. + // Vul DB will not store them so that it could reduce the database size. // This bucket has only vulnerability IDs provided by vendors. They must be stored. err := t.dbc.ForEachVulnerabilityID(func(tx *bolt.Tx, cveID string) error { details := t.vulnClient.GetDetails(cveID) @@ -156,7 +156,7 @@ func (t VulcheckDB) optimize() error { return nil } -func (t VulcheckDB) cleanup() error { +func (t VulDB) cleanup() error { if err := t.dbc.DeleteVulnerabilityIDBucket(); err != nil { return xerrors.Errorf("failed to delete severity bucket: %w", err) } diff --git a/pkg/vulndb/db_test.go b/pkg/vulndb/db_test.go index 7a87c2b..4983545 100644 --- a/pkg/vulndb/db_test.go +++ b/pkg/vulndb/db_test.go @@ -14,13 +14,13 @@ import ( "k8s.io/utils/clock" fake "k8s.io/utils/clock/testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/dbtest" - "github.com/khulnasoft-labs/vulcheck-db/pkg/metadata" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulndb" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/dbtest" + "github.com/khulnasoft-labs/vul-db/pkg/metadata" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulndb" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) type fakeVulnSrc struct{} @@ -34,7 +34,7 @@ func (f fakeVulnSrc) Update(dir string) error { return nil } -func TestVulcheckDB_Insert(t *testing.T) { +func TestVulDB_Insert(t *testing.T) { type fields struct { cacheDir string clock clock.Clock @@ -120,7 +120,7 @@ func TestVulcheckDB_Insert(t *testing.T) { } } -func TestVulcheckDB_Build(t *testing.T) { +func TestVulDB_Build(t *testing.T) { modified := time.Date(2020, 8, 24, 17, 37, 0, 0, time.UTC) published := time.Date(2019, 4, 7, 0, 29, 0, 0, time.UTC) diff --git a/pkg/vulnsrc/alma/alma.go b/pkg/vulnsrc/alma/alma.go index fd0470d..15c07aa 100644 --- a/pkg/vulnsrc/alma/alma.go +++ b/pkg/vulnsrc/alma/alma.go @@ -11,10 +11,10 @@ import ( bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" version "github.com/knqyf263/go-rpm-version" ) @@ -37,7 +37,7 @@ type PutInput struct { CveID string Vuln types.VulnerabilityDetail Advisories map[string]types.Advisory - Erratum Erratum // for extensibility, not used in vulcheck-db + Erratum Erratum // for extensibility, not used in vul-db } type DB interface { @@ -47,7 +47,7 @@ type DB interface { } type VulnSrc struct { - DB // Those who want to customize Vulcheck DB can override put/get methods. + DB // Those who want to customize Vul DB can override put/get methods. } // Alma implements the DB interface diff --git a/pkg/vulnsrc/alma/alma_test.go b/pkg/vulnsrc/alma/alma_test.go index 4b63787..4bf26ed 100644 --- a/pkg/vulnsrc/alma/alma_test.go +++ b/pkg/vulnsrc/alma/alma_test.go @@ -4,11 +4,11 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/alma" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/alma" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) func TestVulnSrc_Update(t *testing.T) { diff --git a/pkg/vulnsrc/alpine/alpine.go b/pkg/vulnsrc/alpine/alpine.go index 53316a9..c079d17 100644 --- a/pkg/vulnsrc/alpine/alpine.go +++ b/pkg/vulnsrc/alpine/alpine.go @@ -10,10 +10,10 @@ import ( bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) const ( diff --git a/pkg/vulnsrc/alpine/alpine_test.go b/pkg/vulnsrc/alpine/alpine_test.go index c22c3f1..8d089f8 100644 --- a/pkg/vulnsrc/alpine/alpine_test.go +++ b/pkg/vulnsrc/alpine/alpine_test.go @@ -4,11 +4,11 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/alpine" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/alpine" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) func TestVulnSrc_Update(t *testing.T) { diff --git a/pkg/vulnsrc/amazon/amazon.go b/pkg/vulnsrc/amazon/amazon.go index 3c0b75a..c86bee5 100644 --- a/pkg/vulnsrc/amazon/amazon.go +++ b/pkg/vulnsrc/amazon/amazon.go @@ -11,11 +11,11 @@ import ( bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - ustrings "github.com/khulnasoft-labs/vulcheck-db/pkg/utils/strings" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + ustrings "github.com/khulnasoft-labs/vul-db/pkg/utils/strings" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) const ( diff --git a/pkg/vulnsrc/amazon/amazon_test.go b/pkg/vulnsrc/amazon/amazon_test.go index 677918d..14a4cd7 100644 --- a/pkg/vulnsrc/amazon/amazon_test.go +++ b/pkg/vulnsrc/amazon/amazon_test.go @@ -5,12 +5,12 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/amazon" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/amazon" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) func TestMain(m *testing.M) { diff --git a/pkg/vulnsrc/arch-linux/archlinux.go b/pkg/vulnsrc/arch-linux/archlinux.go index 143bf6b..8a274f3 100644 --- a/pkg/vulnsrc/arch-linux/archlinux.go +++ b/pkg/vulnsrc/arch-linux/archlinux.go @@ -9,10 +9,10 @@ import ( bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) const ( diff --git a/pkg/vulnsrc/arch-linux/archlinux_test.go b/pkg/vulnsrc/arch-linux/archlinux_test.go index 3fd3d58..3da3593 100644 --- a/pkg/vulnsrc/arch-linux/archlinux_test.go +++ b/pkg/vulnsrc/arch-linux/archlinux_test.go @@ -4,10 +4,10 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) func TestVulnSrc_Update(t *testing.T) { diff --git a/pkg/vulnsrc/bucket/bucket.go b/pkg/vulnsrc/bucket/bucket.go index f4283ff..4b06ca2 100644 --- a/pkg/vulnsrc/bucket/bucket.go +++ b/pkg/vulnsrc/bucket/bucket.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) const separator = "::" diff --git a/pkg/vulnsrc/bucket/bucket_test.go b/pkg/vulnsrc/bucket/bucket_test.go index 9944cd5..5549526 100644 --- a/pkg/vulnsrc/bucket/bucket_test.go +++ b/pkg/vulnsrc/bucket/bucket_test.go @@ -3,7 +3,7 @@ package bucket_test import ( "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/bucket" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/bucket" "github.com/stretchr/testify/assert" ) diff --git a/pkg/vulnsrc/bundler/bundler.go b/pkg/vulnsrc/bundler/bundler.go index 70180db..d0a00e1 100644 --- a/pkg/vulnsrc/bundler/bundler.go +++ b/pkg/vulnsrc/bundler/bundler.go @@ -10,10 +10,10 @@ import ( "golang.org/x/xerrors" "gopkg.in/yaml.v2" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/bucket" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/bucket" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) const bundlerDir = "ruby-advisory-db" diff --git a/pkg/vulnsrc/bundler/bundler_test.go b/pkg/vulnsrc/bundler/bundler_test.go index 0f9e43c..e4f9a98 100644 --- a/pkg/vulnsrc/bundler/bundler_test.go +++ b/pkg/vulnsrc/bundler/bundler_test.go @@ -4,10 +4,10 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/bundler" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/bundler" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" ) func TestVulnSrc_Update(t *testing.T) { diff --git a/pkg/vulnsrc/chainguard/chainguard.go b/pkg/vulnsrc/chainguard/chainguard.go index 7cebe80..395fdba 100644 --- a/pkg/vulnsrc/chainguard/chainguard.go +++ b/pkg/vulnsrc/chainguard/chainguard.go @@ -9,10 +9,10 @@ import ( bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) const ( diff --git a/pkg/vulnsrc/chainguard/chainguard_test.go b/pkg/vulnsrc/chainguard/chainguard_test.go index a477714..78700f5 100644 --- a/pkg/vulnsrc/chainguard/chainguard_test.go +++ b/pkg/vulnsrc/chainguard/chainguard_test.go @@ -4,11 +4,11 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/chainguard" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/chainguard" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) func TestVulnSrc_Update(t *testing.T) { diff --git a/pkg/vulnsrc/composer/composer.go b/pkg/vulnsrc/composer/composer.go index 0f9da84..7eb6ea5 100644 --- a/pkg/vulnsrc/composer/composer.go +++ b/pkg/vulnsrc/composer/composer.go @@ -9,10 +9,10 @@ import ( "golang.org/x/xerrors" "gopkg.in/yaml.v2" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/bucket" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/bucket" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) const composerDir = "php-security-advisories" diff --git a/pkg/vulnsrc/composer/composer_test.go b/pkg/vulnsrc/composer/composer_test.go index ddad600..24c4b84 100644 --- a/pkg/vulnsrc/composer/composer_test.go +++ b/pkg/vulnsrc/composer/composer_test.go @@ -4,9 +4,9 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" ) func TestVulnSrc_Update(t *testing.T) { diff --git a/pkg/vulnsrc/debian/debian.go b/pkg/vulnsrc/debian/debian.go index b8bd4f3..d67858a 100644 --- a/pkg/vulnsrc/debian/debian.go +++ b/pkg/vulnsrc/debian/debian.go @@ -13,11 +13,11 @@ import ( bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - ustrings "github.com/khulnasoft-labs/vulcheck-db/pkg/utils/strings" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + ustrings "github.com/khulnasoft-labs/vul-db/pkg/utils/strings" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) const ( @@ -449,7 +449,7 @@ func (vs VulnSrc) putAdvisory(tx *bolt.Tx, bkt bucket, advisory Advisory) error return nil } -// defaultPut puts the advisory into Vulcheck DB, but it can be overwritten. +// defaultPut puts the advisory into Vul DB, but it can be overwritten. func defaultPut(dbc db.Operation, tx *bolt.Tx, advisory interface{}) error { adv, ok := advisory.(Advisory) if !ok { diff --git a/pkg/vulnsrc/debian/debian_test.go b/pkg/vulnsrc/debian/debian_test.go index d8cf617..7d593e1 100644 --- a/pkg/vulnsrc/debian/debian_test.go +++ b/pkg/vulnsrc/debian/debian_test.go @@ -4,10 +4,10 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/debian" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/debian" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" ) func TestVulnSrc_Update(t *testing.T) { diff --git a/pkg/vulnsrc/ghsa/ghsa.go b/pkg/vulnsrc/ghsa/ghsa.go index 5ed12e7..d258b65 100644 --- a/pkg/vulnsrc/ghsa/ghsa.go +++ b/pkg/vulnsrc/ghsa/ghsa.go @@ -14,11 +14,11 @@ import ( bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/bucket" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/bucket" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) const ghsaDir = "ghsa" diff --git a/pkg/vulnsrc/ghsa/ghsa_test.go b/pkg/vulnsrc/ghsa/ghsa_test.go index 10d87f1..b2303d7 100644 --- a/pkg/vulnsrc/ghsa/ghsa_test.go +++ b/pkg/vulnsrc/ghsa/ghsa_test.go @@ -4,9 +4,9 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" ) func TestVulnSrc_Update(t *testing.T) { diff --git a/pkg/vulnsrc/glad/glad.go b/pkg/vulnsrc/glad/glad.go index 001a29e..56b92e1 100644 --- a/pkg/vulnsrc/glad/glad.go +++ b/pkg/vulnsrc/glad/glad.go @@ -7,11 +7,11 @@ import ( "path/filepath" "strings" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/bucket" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/bucket" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" ) diff --git a/pkg/vulnsrc/glad/glad_test.go b/pkg/vulnsrc/glad/glad_test.go index 875084e..30668c5 100644 --- a/pkg/vulnsrc/glad/glad_test.go +++ b/pkg/vulnsrc/glad/glad_test.go @@ -4,10 +4,10 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/glad" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/glad" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" ) func TestVulnSrc_Update(t *testing.T) { diff --git a/pkg/vulnsrc/mariner/mariner.go b/pkg/vulnsrc/mariner/mariner.go index 42307d5..8607184 100644 --- a/pkg/vulnsrc/mariner/mariner.go +++ b/pkg/vulnsrc/mariner/mariner.go @@ -10,10 +10,10 @@ import ( bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/mariner/oval" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/mariner/oval" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) var ( diff --git a/pkg/vulnsrc/mariner/mariner_test.go b/pkg/vulnsrc/mariner/mariner_test.go index f263ea6..b6b960c 100644 --- a/pkg/vulnsrc/mariner/mariner_test.go +++ b/pkg/vulnsrc/mariner/mariner_test.go @@ -4,11 +4,11 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - cbl "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/mariner" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/types" + cbl "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/mariner" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) func TestVulnSrc_Update(t *testing.T) { diff --git a/pkg/vulnsrc/mariner/oval/oval.go b/pkg/vulnsrc/mariner/oval/oval.go index 37d2842..77439a9 100644 --- a/pkg/vulnsrc/mariner/oval/oval.go +++ b/pkg/vulnsrc/mariner/oval/oval.go @@ -5,7 +5,7 @@ import ( "io" "path/filepath" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/utils" "golang.org/x/xerrors" ) diff --git a/pkg/vulnsrc/mariner/types.go b/pkg/vulnsrc/mariner/types.go index dfea003..80ef390 100644 --- a/pkg/vulnsrc/mariner/types.go +++ b/pkg/vulnsrc/mariner/types.go @@ -1,6 +1,6 @@ package mariner -import "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/mariner/oval" +import "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/mariner/oval" type operator string diff --git a/pkg/vulnsrc/node/node.go b/pkg/vulnsrc/node/node.go index 0fcf444..c370231 100644 --- a/pkg/vulnsrc/node/node.go +++ b/pkg/vulnsrc/node/node.go @@ -11,10 +11,10 @@ import ( bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/bucket" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/bucket" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) const ( diff --git a/pkg/vulnsrc/node/node_test.go b/pkg/vulnsrc/node/node_test.go index 875f2b0..23adf78 100644 --- a/pkg/vulnsrc/node/node_test.go +++ b/pkg/vulnsrc/node/node_test.go @@ -4,9 +4,9 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" ) func TestVulnSrc_Update(t *testing.T) { diff --git a/pkg/vulnsrc/nvd/nvd.go b/pkg/vulnsrc/nvd/nvd.go index 9ad3128..8fcb41b 100644 --- a/pkg/vulnsrc/nvd/nvd.go +++ b/pkg/vulnsrc/nvd/nvd.go @@ -9,13 +9,13 @@ import ( "strings" "time" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/types" bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) const ( diff --git a/pkg/vulnsrc/nvd/nvd_test.go b/pkg/vulnsrc/nvd/nvd_test.go index b3944b8..a4aecf3 100644 --- a/pkg/vulnsrc/nvd/nvd_test.go +++ b/pkg/vulnsrc/nvd/nvd_test.go @@ -4,11 +4,11 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/utils" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/types" ) func TestVulnSrc_Update(t *testing.T) { diff --git a/pkg/vulnsrc/oracle-oval/oracle-oval.go b/pkg/vulnsrc/oracle-oval/oracle-oval.go index c29d018..cb99fb6 100644 --- a/pkg/vulnsrc/oracle-oval/oracle-oval.go +++ b/pkg/vulnsrc/oracle-oval/oracle-oval.go @@ -12,11 +12,11 @@ import ( bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - ustrings "github.com/khulnasoft-labs/vulcheck-db/pkg/utils/strings" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + ustrings "github.com/khulnasoft-labs/vul-db/pkg/utils/strings" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) var ( @@ -36,7 +36,7 @@ type PutInput struct { VulnID string // CVE-ID or ELSA-ID Vuln types.VulnerabilityDetail // vulnerability detail such as CVSS and description Advisories map[AffectedPackage]types.Advisory // pkg => advisory - OVAL OracleOVAL // for extensibility, not used in vulcheck-db + OVAL OracleOVAL // for extensibility, not used in vul-db } type DB interface { @@ -46,7 +46,7 @@ type DB interface { } type VulnSrc struct { - DB // Those who want to customize Vulcheck DB can override put/get methods. + DB // Those who want to customize Vul DB can override put/get methods. } type Oracle struct { @@ -77,7 +77,7 @@ func (vs *VulnSrc) Update(dir string) error { } // Parse parses all the advisories from Alma Linux. -// It is exported for those who want to customize vulcheck-db. +// It is exported for those who want to customize vul-db. func (vs *VulnSrc) parse(rootDir string) ([]OracleOVAL, error) { var ovals []OracleOVAL err := utils.FileWalk(rootDir, func(r io.Reader, path string) error { diff --git a/pkg/vulnsrc/oracle-oval/oracle-oval_test.go b/pkg/vulnsrc/oracle-oval/oracle-oval_test.go index f6b41b8..0bc0358 100644 --- a/pkg/vulnsrc/oracle-oval/oracle-oval_test.go +++ b/pkg/vulnsrc/oracle-oval/oracle-oval_test.go @@ -5,11 +5,11 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) func TestMain(m *testing.M) { diff --git a/pkg/vulnsrc/osv/osv.go b/pkg/vulnsrc/osv/osv.go index 2b492f7..af50827 100644 --- a/pkg/vulnsrc/osv/osv.go +++ b/pkg/vulnsrc/osv/osv.go @@ -12,11 +12,11 @@ import ( bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/bucket" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/bucket" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) const ( diff --git a/pkg/vulnsrc/osv/osv_test.go b/pkg/vulnsrc/osv/osv_test.go index 064f8ef..969352f 100644 --- a/pkg/vulnsrc/osv/osv_test.go +++ b/pkg/vulnsrc/osv/osv_test.go @@ -4,9 +4,9 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" ) func TestVulnSrc_Update(t *testing.T) { diff --git a/pkg/vulnsrc/photon/photon.go b/pkg/vulnsrc/photon/photon.go index c901222..6db982c 100644 --- a/pkg/vulnsrc/photon/photon.go +++ b/pkg/vulnsrc/photon/photon.go @@ -7,10 +7,10 @@ import ( "log" "path/filepath" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" ) diff --git a/pkg/vulnsrc/photon/photon_test.go b/pkg/vulnsrc/photon/photon_test.go index df441cb..0ec2382 100644 --- a/pkg/vulnsrc/photon/photon_test.go +++ b/pkg/vulnsrc/photon/photon_test.go @@ -4,10 +4,10 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) func TestVulnSrc_Update(t *testing.T) { diff --git a/pkg/vulnsrc/redhat-oval/redhat-oval.go b/pkg/vulnsrc/redhat-oval/redhat-oval.go index 134bcb6..a954998 100644 --- a/pkg/vulnsrc/redhat-oval/redhat-oval.go +++ b/pkg/vulnsrc/redhat-oval/redhat-oval.go @@ -15,12 +15,12 @@ import ( "golang.org/x/exp/slices" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils/ints" - ustrings "github.com/khulnasoft-labs/vulcheck-db/pkg/utils/strings" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/utils/ints" + ustrings "github.com/khulnasoft-labs/vul-db/pkg/utils/strings" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) const ( diff --git a/pkg/vulnsrc/redhat-oval/redhat-oval_test.go b/pkg/vulnsrc/redhat-oval/redhat-oval_test.go index 1c742c6..9f4fae0 100644 --- a/pkg/vulnsrc/redhat-oval/redhat-oval_test.go +++ b/pkg/vulnsrc/redhat-oval/redhat-oval_test.go @@ -6,17 +6,17 @@ import ( "sort" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/dbtest" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - redhat "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/redhat-oval" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/dbtest" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + redhat "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/redhat-oval" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) func TestMain(m *testing.M) { diff --git a/pkg/vulnsrc/redhat-oval/types.go b/pkg/vulnsrc/redhat-oval/types.go index 51661ee..dbd344d 100644 --- a/pkg/vulnsrc/redhat-oval/types.go +++ b/pkg/vulnsrc/redhat-oval/types.go @@ -3,7 +3,7 @@ package redhatoval import ( "encoding/json" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/types" ) type redhatOVAL struct { diff --git a/pkg/vulnsrc/redhat/redhat.go b/pkg/vulnsrc/redhat/redhat.go index eaf2728..7aecbe6 100644 --- a/pkg/vulnsrc/redhat/redhat.go +++ b/pkg/vulnsrc/redhat/redhat.go @@ -15,10 +15,10 @@ import ( bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) const ( diff --git a/pkg/vulnsrc/redhat/redhat_test.go b/pkg/vulnsrc/redhat/redhat_test.go index 046ff6b..86ae111 100644 --- a/pkg/vulnsrc/redhat/redhat_test.go +++ b/pkg/vulnsrc/redhat/redhat_test.go @@ -5,10 +5,10 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" ) func TestMain(m *testing.M) { diff --git a/pkg/vulnsrc/rocky/rocky.go b/pkg/vulnsrc/rocky/rocky.go index 41d39a6..40027d5 100644 --- a/pkg/vulnsrc/rocky/rocky.go +++ b/pkg/vulnsrc/rocky/rocky.go @@ -14,11 +14,11 @@ import ( "golang.org/x/exp/slices" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - ustrings "github.com/khulnasoft-labs/vulcheck-db/pkg/utils/strings" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + ustrings "github.com/khulnasoft-labs/vul-db/pkg/utils/strings" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) const ( @@ -48,7 +48,7 @@ type PutInput struct { CveID string Vuln types.VulnerabilityDetail Advisories map[string]types.Advisories // pkg name => advisory - Erratum RLSA // for extensibility, not used in vulcheck-db + Erratum RLSA // for extensibility, not used in vul-db } type DB interface { @@ -89,7 +89,7 @@ func (vs *VulnSrc) Update(dir string) error { } // parse parses all the advisories from Rocky Linux. -// It is exported for those who want to customize vulcheck-db. +// It is exported for those who want to customize vul-db. func (vs *VulnSrc) parse(rootDir string) (map[string][]RLSA, error) { errata := map[string][]RLSA{} err := utils.FileWalk(rootDir, func(r io.Reader, path string) error { @@ -196,7 +196,7 @@ func (vs *VulnSrc) commit(tx *bolt.Tx, platformName string, errata []RLSA) error } else { input.Advisories[pkg.Name] = types.Advisories{ // will save `0.0.0` version for non-`x86_64` arch - // to avoid false positives when using old Vulcheck with new database + // to avoid false positives when using old Vul with new database FixedVersion: fixedVersion("0.0.0", entry.FixedVersion, pkg.Arch), // For backward compatibility Entries: []types.Advisory{entry}, } @@ -272,7 +272,7 @@ func (r *Rocky) Get(release, pkgName, arch string) ([]types.Advisory, error) { } // For backward compatibility - // The old vulcheck-db has no entries, but has fixed versions only. + // The old vul-db has no entries, but has fixed versions only. if len(adv.Entries) == 0 { advisories = append(advisories, types.Advisory{ VulnerabilityID: vulnID, diff --git a/pkg/vulnsrc/rocky/rocky_test.go b/pkg/vulnsrc/rocky/rocky_test.go index cca8ffd..6ee0be3 100644 --- a/pkg/vulnsrc/rocky/rocky_test.go +++ b/pkg/vulnsrc/rocky/rocky_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/dbtest" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/rocky" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/dbtest" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/rocky" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" ) func TestVulnSrc_Update(t *testing.T) { diff --git a/pkg/vulnsrc/suse-cvrf/suse-cvrf.go b/pkg/vulnsrc/suse-cvrf/suse-cvrf.go index 33551ff..65ef481 100644 --- a/pkg/vulnsrc/suse-cvrf/suse-cvrf.go +++ b/pkg/vulnsrc/suse-cvrf/suse-cvrf.go @@ -13,10 +13,10 @@ import ( bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) type Distribution int @@ -247,7 +247,7 @@ func getPackage(packVer string) *Package { } } -// reference: https://github.com/khulnasoft-labs/vulcheck-db/blob/5c844be3ba6b9ef13df640857a10f8737e360feb/pkg/vulnsrc/redhat/redhat.go#L196-L217 +// reference: https://github.com/khulnasoft-labs/vul-db/blob/5c844be3ba6b9ef13df640857a10f8737e360feb/pkg/vulnsrc/redhat/redhat.go#L196-L217 func splitPkgName(pkgName string) (string, string) { var version string diff --git a/pkg/vulnsrc/suse-cvrf/suse-cvrf_test.go b/pkg/vulnsrc/suse-cvrf/suse-cvrf_test.go index 032796a..f9e47bf 100644 --- a/pkg/vulnsrc/suse-cvrf/suse-cvrf_test.go +++ b/pkg/vulnsrc/suse-cvrf/suse-cvrf_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" "github.com/stretchr/testify/assert" ) diff --git a/pkg/vulnsrc/ubuntu/types.go b/pkg/vulnsrc/ubuntu/types.go index 855fc7a..d2a6108 100644 --- a/pkg/vulnsrc/ubuntu/types.go +++ b/pkg/vulnsrc/ubuntu/types.go @@ -6,7 +6,7 @@ type UbuntuCVE struct { Priority string Patches map[PackageName]Patch References []string - PublicDate string // for extensibility, not used in vulcheck-db + PublicDate string // for extensibility, not used in vul-db } type PackageName string diff --git a/pkg/vulnsrc/ubuntu/ubuntu.go b/pkg/vulnsrc/ubuntu/ubuntu.go index 6dff9c8..e3ec039 100644 --- a/pkg/vulnsrc/ubuntu/ubuntu.go +++ b/pkg/vulnsrc/ubuntu/ubuntu.go @@ -10,11 +10,11 @@ import ( bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils/strings" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/utils/strings" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) const ( @@ -194,7 +194,7 @@ func defaultPut(dbc db.Operation, tx *bolt.Tx, advisory interface{}) error { return nil } -// SeverityFromPriority converts Ubuntu priority into Vulcheck severity +// SeverityFromPriority converts Ubuntu priority into Vul severity func SeverityFromPriority(priority string) types.Severity { switch priority { case "untriaged": diff --git a/pkg/vulnsrc/ubuntu/ubuntu_test.go b/pkg/vulnsrc/ubuntu/ubuntu_test.go index 2805da6..269b509 100644 --- a/pkg/vulnsrc/ubuntu/ubuntu_test.go +++ b/pkg/vulnsrc/ubuntu/ubuntu_test.go @@ -3,11 +3,11 @@ package ubuntu_test import ( "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/ubuntu" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/ubuntu" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) func TestVulnSrc_Update(t *testing.T) { diff --git a/pkg/vulnsrc/vulnerability/const.go b/pkg/vulnsrc/vulnerability/const.go index e19d9f2..aad182c 100644 --- a/pkg/vulnsrc/vulnerability/const.go +++ b/pkg/vulnsrc/vulnerability/const.go @@ -1,6 +1,6 @@ package vulnerability -import "github.com/khulnasoft-labs/vulcheck-db/pkg/types" +import "github.com/khulnasoft-labs/vul-db/pkg/types" const ( // Data source diff --git a/pkg/vulnsrc/vulnerability/vulnerability.go b/pkg/vulnsrc/vulnerability/vulnerability.go index a972162..abde1ae 100644 --- a/pkg/vulnsrc/vulnerability/vulnerability.go +++ b/pkg/vulnsrc/vulnerability/vulnerability.go @@ -4,9 +4,9 @@ import ( "sort" "strings" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/log" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/log" + "github.com/khulnasoft-labs/vul-db/pkg/types" ) const ( diff --git a/pkg/vulnsrc/vulnerability/vulnerability_test.go b/pkg/vulnsrc/vulnerability/vulnerability_test.go index 563906a..552474f 100644 --- a/pkg/vulnsrc/vulnerability/vulnerability_test.go +++ b/pkg/vulnsrc/vulnerability/vulnerability_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/dbtest" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/dbtest" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) func TestGetDetails(t *testing.T) { diff --git a/pkg/vulnsrc/vulnsrc.go b/pkg/vulnsrc/vulnsrc.go index 9595d1b..b1f2b70 100644 --- a/pkg/vulnsrc/vulnsrc.go +++ b/pkg/vulnsrc/vulnsrc.go @@ -1,28 +1,28 @@ package vulnsrc import ( - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/alma" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/alpine" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/amazon" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/bundler" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/chainguard" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/composer" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/debian" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/ghsa" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/glad" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/mariner" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/node" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/nvd" - oracleoval "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/oracle-oval" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/osv" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/photon" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/redhat" - redhatoval "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/redhat-oval" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/rocky" - susecvrf "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/suse-cvrf" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/ubuntu" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/wolfi" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/alma" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/alpine" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/amazon" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/bundler" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/chainguard" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/composer" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/debian" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/ghsa" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/glad" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/mariner" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/node" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/nvd" + oracleoval "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/oracle-oval" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/osv" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/photon" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/redhat" + redhatoval "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/redhat-oval" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/rocky" + susecvrf "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/suse-cvrf" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/ubuntu" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/wolfi" ) type VulnSrc interface { diff --git a/pkg/vulnsrc/wolfi/wolfi.go b/pkg/vulnsrc/wolfi/wolfi.go index c9168ed..87eb2f4 100644 --- a/pkg/vulnsrc/wolfi/wolfi.go +++ b/pkg/vulnsrc/wolfi/wolfi.go @@ -9,10 +9,10 @@ import ( bolt "go.etcd.io/bbolt" "golang.org/x/xerrors" - "github.com/khulnasoft-labs/vulcheck-db/pkg/db" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/utils" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/db" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/utils" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) const ( diff --git a/pkg/vulnsrc/wolfi/wolfi_test.go b/pkg/vulnsrc/wolfi/wolfi_test.go index 3de3700..2332677 100644 --- a/pkg/vulnsrc/wolfi/wolfi_test.go +++ b/pkg/vulnsrc/wolfi/wolfi_test.go @@ -4,11 +4,11 @@ import ( "path/filepath" "testing" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/wolfi" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrctest" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/wolfi" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrctest" - "github.com/khulnasoft-labs/vulcheck-db/pkg/types" - "github.com/khulnasoft-labs/vulcheck-db/pkg/vulnsrc/vulnerability" + "github.com/khulnasoft-labs/vul-db/pkg/types" + "github.com/khulnasoft-labs/vul-db/pkg/vulnsrc/vulnerability" ) func TestVulnSrc_Update(t *testing.T) {