Skip to content

Commit 85eee48

Browse files
committed
TUN-7586: Upgrade go-jose/go-jose/v3 and core-os/go-oidc/v3
Removes usages of gopkg.in/square/go-jose.v2 and gopkg.in/coreos/go-oidc.v2 packages.
1 parent 9b8a533 commit 85eee48

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+130
-13272
lines changed

go.mod

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/cloudflare/brotli-go v0.0.0-20191101163834-d34379f7ff93
77
github.com/cloudflare/golibs v0.0.0-20170913112048-333127dbecfc
88
github.com/coredns/coredns v1.10.0
9-
github.com/coreos/go-oidc/v3 v3.4.0
9+
github.com/coreos/go-oidc/v3 v3.6.0
1010
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
1111
github.com/facebookgo/grace v0.0.0-20180706040059-75cf19382434
1212
github.com/fsnotify/fsnotify v1.4.9
@@ -43,9 +43,7 @@ require (
4343
golang.org/x/sys v0.7.0
4444
golang.org/x/term v0.7.0
4545
google.golang.org/protobuf v1.28.1
46-
gopkg.in/coreos/go-oidc.v2 v2.2.1
4746
gopkg.in/natefinch/lumberjack.v2 v2.0.0
48-
gopkg.in/square/go-jose.v2 v2.6.0
4947
gopkg.in/yaml.v3 v3.0.1
5048
nhooyr.io/websocket v1.8.7
5149
zombiezen.com/go/capnproto2 v2.18.0+incompatible
@@ -86,15 +84,14 @@ require (
8684
github.com/onsi/gomega v1.23.0 // indirect
8785
github.com/opentracing/opentracing-go v1.2.0 // indirect
8886
github.com/pmezard/go-difflib v1.0.0 // indirect
89-
github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
9087
github.com/prometheus/common v0.37.0 // indirect
9188
github.com/prometheus/procfs v0.8.0 // indirect
9289
github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
9390
github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
9491
github.com/russross/blackfriday/v2 v2.1.0 // indirect
9592
golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect
9693
golang.org/x/mod v0.8.0 // indirect
97-
golang.org/x/oauth2 v0.4.0 // indirect
94+
golang.org/x/oauth2 v0.6.0 // indirect
9895
golang.org/x/text v0.9.0 // indirect
9996
golang.org/x/tools v0.6.0 // indirect
10097
google.golang.org/appengine v1.6.7 // indirect

go.sum

Lines changed: 4 additions & 222 deletions
Large diffs are not rendered by default.

management/token_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"errors"
88
"testing"
99

10+
"github.com/go-jose/go-jose/v3"
1011
"github.com/stretchr/testify/require"
11-
"gopkg.in/square/go-jose.v2"
1212
)
1313

1414
const (

sshgen/sshgen.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import (
1515
"net/url"
1616
"time"
1717

18+
"github.com/go-jose/go-jose/v3/jwt"
1819
homedir "github.com/mitchellh/go-homedir"
1920
"github.com/pkg/errors"
2021
gossh "golang.org/x/crypto/ssh"
21-
"gopkg.in/square/go-jose.v2/jwt"
2222

2323
"github.com/cloudflare/cloudflared/config"
2424
cfpath "github.com/cloudflare/cloudflared/token"

sshgen/sshgen_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
"testing"
1717
"time"
1818

19+
"github.com/go-jose/go-jose/v3"
20+
"github.com/go-jose/go-jose/v3/jwt"
1921
"github.com/stretchr/testify/assert"
20-
"gopkg.in/square/go-jose.v2"
21-
"gopkg.in/square/go-jose.v2/jwt"
2222

2323
"github.com/cloudflare/cloudflared/config"
2424
cfpath "github.com/cloudflare/cloudflared/token"

token/token.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"syscall"
1414
"time"
1515

16+
"github.com/go-jose/go-jose/v3"
1617
"github.com/pkg/errors"
1718
"github.com/rs/zerolog"
18-
"gopkg.in/square/go-jose.v2"
1919

2020
"github.com/cloudflare/cloudflared/config"
2121
"github.com/cloudflare/cloudflared/retry"

validation/validation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"strings"
1010
"time"
1111

12+
"github.com/coreos/go-oidc/v3/oidc"
1213
"github.com/pkg/errors"
1314
"golang.org/x/net/idna"
14-
"gopkg.in/coreos/go-oidc.v2"
1515
)
1616

1717
const (

vendor/github.com/coreos/go-oidc/v3/oidc/jose.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/go-oidc/v3/oidc/jwks.go

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/go-oidc/v3/oidc/oidc.go

Lines changed: 79 additions & 54 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)