Skip to content

Commit 9ba2a4b

Browse files
authored
chore: bump go-jose (#1180)
1 parent 62ca1e8 commit 9ba2a4b

File tree

9 files changed

+48
-47
lines changed

9 files changed

+48
-47
lines changed

api/credential.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
"github.com/ory/oathkeeper/x"
1818
"github.com/ory/x/urlx"
1919

20+
"github.com/go-jose/go-jose/v3"
2021
"github.com/julienschmidt/httprouter"
21-
"gopkg.in/square/go-jose.v2"
2222
)
2323

2424
const (

api/credential_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"net/http/httptest"
1212
"testing"
1313

14-
"github.com/square/go-jose"
14+
"github.com/go-jose/go-jose/v3"
1515
"github.com/stretchr/testify/assert"
1616
"github.com/stretchr/testify/require"
1717

credentials/fetcher.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"context"
88
"net/url"
99

10-
"gopkg.in/square/go-jose.v2"
10+
"github.com/go-jose/go-jose/v3"
1111
)
1212

1313
type Fetcher interface {

credentials/fetcher_default.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818

1919
"github.com/ory/oathkeeper/internal/cloudstorage"
2020

21+
"github.com/go-jose/go-jose/v3"
2122
"github.com/pkg/errors"
22-
"gopkg.in/square/go-jose.v2"
2323

2424
"github.com/ory/x/logrusx"
2525
"github.com/ory/x/urlx"

credentials/signer_default.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"net/url"
1111
"reflect"
1212

13+
"github.com/go-jose/go-jose/v3"
1314
"github.com/golang-jwt/jwt/v4"
1415
"github.com/pkg/errors"
1516
"golang.org/x/crypto/ed25519"
16-
"gopkg.in/square/go-jose.v2"
1717
)
1818

1919
var _ Signer = new(DefaultSigner)

go.mod

+13-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
go 1.22
22

3+
toolchain go1.22.5
4+
35
module github.com/ory/oathkeeper
46

57
replace github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.14.10
@@ -8,13 +10,14 @@ require (
810
github.com/Azure/azure-pipeline-go v0.2.2
911
github.com/Azure/azure-storage-blob-go v0.9.0
1012
github.com/Masterminds/sprig/v3 v3.2.2
11-
github.com/auth0/go-jwt-middleware/v2 v2.1.0
13+
github.com/auth0/go-jwt-middleware/v2 v2.2.2
1214
github.com/aws/aws-sdk-go v1.34.28
1315
github.com/blang/semver v3.5.1+incompatible
1416
github.com/dgraph-io/ristretto v0.1.1
1517
github.com/dlclark/regexp2 v1.2.0
1618
github.com/ghodss/yaml v1.0.0
1719
github.com/go-faker/faker/v4 v4.0.0-beta.2
20+
github.com/go-jose/go-jose/v3 v3.0.3
1821
github.com/go-openapi/errors v0.20.3
1922
github.com/go-openapi/runtime v0.24.2
2023
github.com/go-openapi/strfmt v0.21.3
@@ -29,13 +32,13 @@ require (
2932
github.com/golang/mock v1.6.0
3033
github.com/google/go-replayers/httpreplay v1.1.1
3134
github.com/google/uuid v1.4.0
32-
github.com/hashicorp/go-retryablehttp v0.7.1
35+
github.com/hashicorp/go-retryablehttp v0.7.7
3336
github.com/julienschmidt/httprouter v1.3.0
3437
github.com/knadh/koanf/v2 v2.0.1
3538
github.com/lib/pq v1.10.7
3639
github.com/mitchellh/copystructure v1.2.0
3740
github.com/ory/analytics-go/v5 v5.0.1
38-
github.com/ory/fosite v0.44.0
41+
github.com/ory/fosite v0.47.0
3942
github.com/ory/go-acc v0.2.9-0.20230103102148-6b1c9a70dbbe
4043
github.com/ory/gojsonschema v1.2.0
4144
github.com/ory/graceful v0.1.1
@@ -52,7 +55,6 @@ require (
5255
github.com/sirupsen/logrus v1.9.3
5356
github.com/spf13/cobra v1.7.0
5457
github.com/spf13/pflag v1.0.5
55-
github.com/square/go-jose v2.3.1+incompatible
5658
github.com/stretchr/testify v1.9.0
5759
github.com/tidwall/gjson v1.14.3
5860
github.com/tidwall/sjson v1.2.5
@@ -66,7 +68,6 @@ require (
6668
golang.org/x/oauth2 v0.14.0
6769
google.golang.org/api v0.149.0
6870
google.golang.org/grpc v1.59.0
69-
gopkg.in/square/go-jose.v2 v2.6.0
7071
)
7172

7273
require (
@@ -83,7 +84,7 @@ require (
8384
github.com/Masterminds/semver/v3 v3.1.1 // indirect
8485
github.com/Microsoft/go-winio v0.6.0 // indirect
8586
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
86-
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
87+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
8788
github.com/avast/retry-go/v4 v4.3.0 // indirect
8889
github.com/aymerick/douceur v0.2.0 // indirect
8990
github.com/beorn7/perks v1.0.1 // indirect
@@ -92,23 +93,20 @@ require (
9293
github.com/cockroachdb/cockroach-go/v2 v2.2.16 // indirect
9394
github.com/containerd/continuity v0.3.0 // indirect
9495
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
95-
github.com/dave/jennifer v1.4.0 // indirect
9696
github.com/davecgh/go-spew v1.1.1 // indirect
9797
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
9898
github.com/docker/cli v20.10.21+incompatible // indirect
9999
github.com/docker/distribution v2.8.2+incompatible // indirect
100100
github.com/docker/docker v20.10.24+incompatible // indirect
101101
github.com/docker/go-connections v0.4.0 // indirect
102102
github.com/docker/go-units v0.5.0 // indirect
103-
github.com/dustin/go-humanize v1.0.0 // indirect
104-
github.com/ecordell/optgen v0.0.6 // indirect
103+
github.com/dustin/go-humanize v1.0.1 // indirect
105104
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
106-
github.com/fatih/color v1.13.0 // indirect
105+
github.com/fatih/color v1.16.0 // indirect
107106
github.com/fatih/structs v1.1.0 // indirect
108107
github.com/felixge/fgprof v0.9.3 // indirect
109108
github.com/felixge/httpsnoop v1.0.4 // indirect
110109
github.com/fsnotify/fsnotify v1.6.0 // indirect
111-
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
112110
github.com/go-logr/logr v1.3.0 // indirect
113111
github.com/go-logr/stdr v1.2.2 // indirect
114112
github.com/go-openapi/analysis v0.21.4 // indirect
@@ -186,9 +184,9 @@ require (
186184
github.com/mailru/easyjson v0.7.7 // indirect
187185
github.com/mattn/go-colorable v0.1.13 // indirect
188186
github.com/mattn/go-ieproxy v0.0.1 // indirect
189-
github.com/mattn/go-isatty v0.0.16 // indirect
187+
github.com/mattn/go-isatty v0.0.20 // indirect
190188
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
191-
github.com/mattn/goveralls v0.0.6 // indirect
189+
github.com/mattn/goveralls v0.0.12 // indirect
192190
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
193191
github.com/microcosm-cc/bluemonday v1.0.21 // indirect
194192
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -249,7 +247,7 @@ require (
249247
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
250248
golang.org/x/mod v0.17.0 // indirect
251249
golang.org/x/net v0.26.0 // indirect
252-
golang.org/x/sync v0.7.0 // indirect
250+
golang.org/x/sync v0.8.0 // indirect
253251
golang.org/x/sys v0.21.0 // indirect
254252
golang.org/x/text v0.16.0 // indirect
255253
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
@@ -259,6 +257,7 @@ require (
259257
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
260258
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
261259
google.golang.org/protobuf v1.33.0 // indirect
260+
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
262261
gopkg.in/ini.v1 v1.67.0 // indirect
263262
gopkg.in/yaml.v2 v2.4.0 // indirect
264263
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)