Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: bump go-jose #1180

Merged
merged 7 commits into from
Sep 20, 2024
Merged

chore: bump go-jose #1180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
98333e9
chore: bump go-jose
hperl Sep 5, 2024
3e47a38
chore: bump go
hperl Sep 6, 2024
806383d
fix
hperl Sep 6, 2024
0fb7a5d
Merge branch 'master' into hperl/bump-go-jose
hperl Sep 11, 2024
74914b9
Merge branch 'master' into hperl/bump-go-jose
hperl Sep 13, 2024
3336170
fix merge
hperl Sep 16, 2024
bdc7eac
fix aud
hperl Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/credential.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"github.com/ory/oathkeeper/x"
"github.com/ory/x/urlx"

"github.com/go-jose/go-jose/v3"
"github.com/julienschmidt/httprouter"
"gopkg.in/square/go-jose.v2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion api/credential_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"net/http/httptest"
"testing"

"github.com/square/go-jose"
"github.com/go-jose/go-jose/v3"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

Expand Down
2 changes: 1 addition & 1 deletion credentials/fetcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"context"
"net/url"

"gopkg.in/square/go-jose.v2"
"github.com/go-jose/go-jose/v3"
)

type Fetcher interface {
Expand Down
2 changes: 1 addition & 1 deletion credentials/fetcher_default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (

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

"github.com/go-jose/go-jose/v3"
"github.com/pkg/errors"
"gopkg.in/square/go-jose.v2"

"github.com/ory/x/logrusx"
"github.com/ory/x/urlx"
Expand Down
2 changes: 1 addition & 1 deletion credentials/signer_default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"net/url"
"reflect"

"github.com/go-jose/go-jose/v3"
"github.com/golang-jwt/jwt/v4"
"github.com/pkg/errors"
"golang.org/x/crypto/ed25519"
"gopkg.in/square/go-jose.v2"
)

var _ Signer = new(DefaultSigner)
Expand Down
27 changes: 13 additions & 14 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
go 1.22

toolchain go1.22.5

module github.com/ory/oathkeeper

replace github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.14.10
Expand All @@ -8,13 +10,14 @@ require (
github.com/Azure/azure-pipeline-go v0.2.2
github.com/Azure/azure-storage-blob-go v0.9.0
github.com/Masterminds/sprig/v3 v3.2.2
github.com/auth0/go-jwt-middleware/v2 v2.1.0
github.com/auth0/go-jwt-middleware/v2 v2.2.2
github.com/aws/aws-sdk-go v1.34.28
github.com/blang/semver v3.5.1+incompatible
github.com/dgraph-io/ristretto v0.1.1
github.com/dlclark/regexp2 v1.2.0
github.com/ghodss/yaml v1.0.0
github.com/go-faker/faker/v4 v4.0.0-beta.2
github.com/go-jose/go-jose/v3 v3.0.3
github.com/go-openapi/errors v0.20.3
github.com/go-openapi/runtime v0.24.2
github.com/go-openapi/strfmt v0.21.3
Expand All @@ -29,13 +32,13 @@ require (
github.com/golang/mock v1.6.0
github.com/google/go-replayers/httpreplay v1.1.1
github.com/google/uuid v1.4.0
github.com/hashicorp/go-retryablehttp v0.7.1
github.com/hashicorp/go-retryablehttp v0.7.7
github.com/julienschmidt/httprouter v1.3.0
github.com/knadh/koanf/v2 v2.0.1
github.com/lib/pq v1.10.7
github.com/mitchellh/copystructure v1.2.0
github.com/ory/analytics-go/v5 v5.0.1
github.com/ory/fosite v0.44.0
github.com/ory/fosite v0.47.0
github.com/ory/go-acc v0.2.9-0.20230103102148-6b1c9a70dbbe
github.com/ory/gojsonschema v1.2.0
github.com/ory/graceful v0.1.1
Expand All @@ -52,7 +55,6 @@ require (
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
github.com/square/go-jose v2.3.1+incompatible
github.com/stretchr/testify v1.9.0
github.com/tidwall/gjson v1.14.3
github.com/tidwall/sjson v1.2.5
Expand All @@ -66,7 +68,6 @@ require (
golang.org/x/oauth2 v0.14.0
google.golang.org/api v0.149.0
google.golang.org/grpc v1.59.0
gopkg.in/square/go-jose.v2 v2.6.0
)

require (
Expand All @@ -83,7 +84,7 @@ require (
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/Microsoft/go-winio v0.6.0 // indirect
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/avast/retry-go/v4 v4.3.0 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand All @@ -92,23 +93,20 @@ require (
github.com/cockroachdb/cockroach-go/v2 v2.2.16 // indirect
github.com/containerd/continuity v0.3.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/dave/jennifer v1.4.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/docker/cli v20.10.21+incompatible // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker v20.10.24+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/ecordell/optgen v0.0.6 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/felixge/fgprof v0.9.3 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/analysis v0.21.4 // indirect
Expand Down Expand Up @@ -186,9 +184,9 @@ require (
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-ieproxy v0.0.1 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
github.com/mattn/goveralls v0.0.6 // indirect
github.com/mattn/goveralls v0.0.12 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/microcosm-cc/bluemonday v1.0.21 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
Expand Down Expand Up @@ -249,7 +247,7 @@ require (
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
Expand All @@ -259,6 +257,7 @@ require (
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading
Loading