From b0b5f6e8765bd7048873a48acb016f374dfc5e44 Mon Sep 17 00:00:00 2001 From: Pierre Fenoll Date: Fri, 8 Dec 2023 13:32:44 +0100 Subject: [PATCH 1/4] cmd/validate: re-enable go run ...@latest now that unsafe dep sums are dropped Signed-off-by: Pierre Fenoll --- go.mod | 6 ------ 1 file changed, 6 deletions(-) diff --git a/go.mod b/go.mod index f60509aba..1f135376a 100644 --- a/go.mod +++ b/go.mod @@ -2,12 +2,6 @@ module github.com/getkin/kin-openapi go 1.20 -exclude ( - // these versions contain a nil pointer CVE - gopkg.in/yaml.v3 v3.0.0 - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c -) - require ( github.com/go-openapi/jsonpointer v0.19.6 github.com/gorilla/mux v1.8.0 From db3891f8a06c3b8c17d5205629b30b778f1e92f6 Mon Sep 17 00:00:00 2001 From: Pierre Fenoll Date: Fri, 8 Dec 2023 13:36:44 +0100 Subject: [PATCH 2/4] i dont see why thatd change Signed-off-by: Pierre Fenoll --- .github/docs/openapi2.txt | 2 +- .github/docs/openapi2conv.txt | 2 +- .github/docs/openapi3.txt | 2 +- .github/docs/openapi3filter.txt | 2 +- .github/docs/openapi3gen.txt | 2 +- .github/docs/routers.txt | 2 +- .github/docs/routers_gorillamux.txt | 2 +- .github/docs/routers_legacy.txt | 2 +- .github/docs/routers_legacy_pathpattern.txt | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/docs/openapi2.txt b/.github/docs/openapi2.txt index d65cd1815..b0956411e 100644 --- a/.github/docs/openapi2.txt +++ b/.github/docs/openapi2.txt @@ -1,4 +1,4 @@ -package openapi2 // import "github.com/getkin/kin-openapi/openapi2" +package openapi2 // import "." Package openapi2 parses and writes OpenAPIv2 specification documents. diff --git a/.github/docs/openapi2conv.txt b/.github/docs/openapi2conv.txt index 2f9f6deca..9bb3983cc 100644 --- a/.github/docs/openapi2conv.txt +++ b/.github/docs/openapi2conv.txt @@ -1,4 +1,4 @@ -package openapi2conv // import "github.com/getkin/kin-openapi/openapi2conv" +package openapi2conv // import "." Package openapi2conv converts an OpenAPI v2 specification document to v3. diff --git a/.github/docs/openapi3.txt b/.github/docs/openapi3.txt index 44e641f3b..30b76dd82 100644 --- a/.github/docs/openapi3.txt +++ b/.github/docs/openapi3.txt @@ -1,4 +1,4 @@ -package openapi3 // import "github.com/getkin/kin-openapi/openapi3" +package openapi3 // import "." Package openapi3 parses and writes OpenAPI 3 specification documents. diff --git a/.github/docs/openapi3filter.txt b/.github/docs/openapi3filter.txt index 7c14783e3..f0bcdaccc 100644 --- a/.github/docs/openapi3filter.txt +++ b/.github/docs/openapi3filter.txt @@ -1,4 +1,4 @@ -package openapi3filter // import "github.com/getkin/kin-openapi/openapi3filter" +package openapi3filter // import "." Package openapi3filter validates that requests and inputs request an OpenAPI 3 specification file. diff --git a/.github/docs/openapi3gen.txt b/.github/docs/openapi3gen.txt index 9cf293cd2..e09528cd8 100644 --- a/.github/docs/openapi3gen.txt +++ b/.github/docs/openapi3gen.txt @@ -1,4 +1,4 @@ -package openapi3gen // import "github.com/getkin/kin-openapi/openapi3gen" +package openapi3gen // import "." Package openapi3gen generates OpenAPIv3 JSON schemas from Go types. diff --git a/.github/docs/routers.txt b/.github/docs/routers.txt index e2605a80a..cd3da62cd 100644 --- a/.github/docs/routers.txt +++ b/.github/docs/routers.txt @@ -1,4 +1,4 @@ -package routers // import "github.com/getkin/kin-openapi/routers" +package routers // import "." VARIABLES diff --git a/.github/docs/routers_gorillamux.txt b/.github/docs/routers_gorillamux.txt index a7c8a8ec4..c5e205d36 100644 --- a/.github/docs/routers_gorillamux.txt +++ b/.github/docs/routers_gorillamux.txt @@ -1,4 +1,4 @@ -package gorillamux // import "github.com/getkin/kin-openapi/routers/gorillamux" +package gorillamux // import "." Package gorillamux implements a router. diff --git a/.github/docs/routers_legacy.txt b/.github/docs/routers_legacy.txt index 9082e9304..b09b46366 100644 --- a/.github/docs/routers_legacy.txt +++ b/.github/docs/routers_legacy.txt @@ -1,4 +1,4 @@ -package legacy // import "github.com/getkin/kin-openapi/routers/legacy" +package legacy // import "." Package legacy implements a router. diff --git a/.github/docs/routers_legacy_pathpattern.txt b/.github/docs/routers_legacy_pathpattern.txt index 27967330b..86fe6891e 100644 --- a/.github/docs/routers_legacy_pathpattern.txt +++ b/.github/docs/routers_legacy_pathpattern.txt @@ -1,4 +1,4 @@ -package pathpattern // import "github.com/getkin/kin-openapi/routers/legacy/pathpattern" +package pathpattern // import "." Package pathpattern implements path matching. From 750a2943d4abfab6347799b513c52381ae0532f4 Mon Sep 17 00:00:00 2001 From: Pierre Fenoll Date: Mon, 22 Jan 2024 20:54:11 +0100 Subject: [PATCH 3/4] up jsonpointer and the rest Signed-off-by: Pierre Fenoll --- go.mod | 9 +++++---- go.sum | 35 ++++++++++++----------------------- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/go.mod b/go.mod index 1f135376a..3d6ff7e83 100644 --- a/go.mod +++ b/go.mod @@ -3,19 +3,20 @@ module github.com/getkin/kin-openapi go 1.20 require ( - github.com/go-openapi/jsonpointer v0.19.6 - github.com/gorilla/mux v1.8.0 + github.com/go-openapi/jsonpointer v0.20.2 + github.com/gorilla/mux v1.8.1 github.com/invopop/yaml v0.2.0 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 github.com/perimeterx/marshmallow v1.1.5 - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.8.4 gopkg.in/yaml.v3 v3.0.1 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-openapi/swag v0.22.4 // indirect + github.com/go-openapi/swag v0.22.8 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect ) diff --git a/go.sum b/go.sum index 23e856ac6..82537b7ad 100644 --- a/go.sum +++ b/go.sum @@ -1,25 +1,18 @@ -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -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/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= -github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= -github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= -github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q= +github.com/go-openapi/jsonpointer v0.20.2/go.mod h1:bHen+N0u1KEO3YlmqOjTT9Adn1RfD91Ar825/PuiRVs= +github.com/go-openapi/swag v0.22.8 h1:/9RjDSQ0vbFR+NyjGMkFTsA1IA0fmhKSThmfGZjicbw= +github.com/go-openapi/swag v0.22.8/go.mod h1:6QT22icPLEqAM/z/TChgb4WAveCHF92+2gF0CNjHpPI= github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM= -github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= +github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/invopop/yaml v0.2.0 h1:7zky/qH+O0DwAyoobXUqvVBwgBFRxKoQ/3FjcVpjTMY= github.com/invopop/yaml v0.2.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= @@ -28,17 +21,13 @@ github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw= 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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 2d1e415899bb3550e2937d02481b2735ebdba17e Mon Sep 17 00:00:00 2001 From: Pierre Fenoll Date: Mon, 22 Jan 2024 20:56:34 +0100 Subject: [PATCH 4/4] hm Signed-off-by: Pierre Fenoll --- .github/docs/openapi2.txt | 2 +- .github/docs/openapi2conv.txt | 2 +- .github/docs/openapi3.txt | 2 +- .github/docs/openapi3filter.txt | 2 +- .github/docs/openapi3gen.txt | 2 +- .github/docs/routers.txt | 2 +- .github/docs/routers_gorillamux.txt | 2 +- .github/docs/routers_legacy.txt | 2 +- .github/docs/routers_legacy_pathpattern.txt | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/docs/openapi2.txt b/.github/docs/openapi2.txt index b0956411e..d65cd1815 100644 --- a/.github/docs/openapi2.txt +++ b/.github/docs/openapi2.txt @@ -1,4 +1,4 @@ -package openapi2 // import "." +package openapi2 // import "github.com/getkin/kin-openapi/openapi2" Package openapi2 parses and writes OpenAPIv2 specification documents. diff --git a/.github/docs/openapi2conv.txt b/.github/docs/openapi2conv.txt index 9bb3983cc..2f9f6deca 100644 --- a/.github/docs/openapi2conv.txt +++ b/.github/docs/openapi2conv.txt @@ -1,4 +1,4 @@ -package openapi2conv // import "." +package openapi2conv // import "github.com/getkin/kin-openapi/openapi2conv" Package openapi2conv converts an OpenAPI v2 specification document to v3. diff --git a/.github/docs/openapi3.txt b/.github/docs/openapi3.txt index 30b76dd82..44e641f3b 100644 --- a/.github/docs/openapi3.txt +++ b/.github/docs/openapi3.txt @@ -1,4 +1,4 @@ -package openapi3 // import "." +package openapi3 // import "github.com/getkin/kin-openapi/openapi3" Package openapi3 parses and writes OpenAPI 3 specification documents. diff --git a/.github/docs/openapi3filter.txt b/.github/docs/openapi3filter.txt index f0bcdaccc..7c14783e3 100644 --- a/.github/docs/openapi3filter.txt +++ b/.github/docs/openapi3filter.txt @@ -1,4 +1,4 @@ -package openapi3filter // import "." +package openapi3filter // import "github.com/getkin/kin-openapi/openapi3filter" Package openapi3filter validates that requests and inputs request an OpenAPI 3 specification file. diff --git a/.github/docs/openapi3gen.txt b/.github/docs/openapi3gen.txt index e09528cd8..9cf293cd2 100644 --- a/.github/docs/openapi3gen.txt +++ b/.github/docs/openapi3gen.txt @@ -1,4 +1,4 @@ -package openapi3gen // import "." +package openapi3gen // import "github.com/getkin/kin-openapi/openapi3gen" Package openapi3gen generates OpenAPIv3 JSON schemas from Go types. diff --git a/.github/docs/routers.txt b/.github/docs/routers.txt index cd3da62cd..e2605a80a 100644 --- a/.github/docs/routers.txt +++ b/.github/docs/routers.txt @@ -1,4 +1,4 @@ -package routers // import "." +package routers // import "github.com/getkin/kin-openapi/routers" VARIABLES diff --git a/.github/docs/routers_gorillamux.txt b/.github/docs/routers_gorillamux.txt index c5e205d36..a7c8a8ec4 100644 --- a/.github/docs/routers_gorillamux.txt +++ b/.github/docs/routers_gorillamux.txt @@ -1,4 +1,4 @@ -package gorillamux // import "." +package gorillamux // import "github.com/getkin/kin-openapi/routers/gorillamux" Package gorillamux implements a router. diff --git a/.github/docs/routers_legacy.txt b/.github/docs/routers_legacy.txt index b09b46366..9082e9304 100644 --- a/.github/docs/routers_legacy.txt +++ b/.github/docs/routers_legacy.txt @@ -1,4 +1,4 @@ -package legacy // import "." +package legacy // import "github.com/getkin/kin-openapi/routers/legacy" Package legacy implements a router. diff --git a/.github/docs/routers_legacy_pathpattern.txt b/.github/docs/routers_legacy_pathpattern.txt index 86fe6891e..27967330b 100644 --- a/.github/docs/routers_legacy_pathpattern.txt +++ b/.github/docs/routers_legacy_pathpattern.txt @@ -1,4 +1,4 @@ -package pathpattern // import "." +package pathpattern // import "github.com/getkin/kin-openapi/routers/legacy/pathpattern" Package pathpattern implements path matching.