Skip to content

Commit 1e3caa4

Browse files
Merge pull request #1217 from ricardomaraschini/jwt-4.18-2
OCPBUGS-53873: bump github.com/golang-jwt/jwt
2 parents 5f1c232 + 239a6a5 commit 1e3caa4

40 files changed

+235
-1847
lines changed

cmd/move-blobs/go.mod

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,11 @@ require (
2929
golang.org/x/sys v0.15.0 // indirect
3030
golang.org/x/text v0.14.0 // indirect
3131
)
32+
33+
replace (
34+
// CVE-2025-30204
35+
// By replacing we can avoid bumping the go version making the backport
36+
// possible for old releases.
37+
github.com/golang-jwt/jwt/v4 => github.com/golang-jwt/jwt/v4 v4.5.2
38+
github.com/golang-jwt/jwt/v5 => github.com/golang-jwt/jwt/v5 v5.2.2
39+
)

cmd/move-blobs/go.sum

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
2828
github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
2929
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
3030
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
31-
github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
32-
github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
33-
github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
34-
github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw=
35-
github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
31+
github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
32+
github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
33+
github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
34+
github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
3635
github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
3736
github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
3837
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=

cmd/move-blobs/vendor/github.com/golang-jwt/jwt/v4/parser.go

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

cmd/move-blobs/vendor/github.com/golang-jwt/jwt/v5/README.md

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

cmd/move-blobs/vendor/github.com/golang-jwt/jwt/v5/SECURITY.md

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

cmd/move-blobs/vendor/github.com/golang-jwt/jwt/v5/ecdsa.go

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

cmd/move-blobs/vendor/github.com/golang-jwt/jwt/v5/hmac.go

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

cmd/move-blobs/vendor/github.com/golang-jwt/jwt/v5/parser.go

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

cmd/move-blobs/vendor/github.com/golang-jwt/jwt/v5/token.go

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

cmd/move-blobs/vendor/modules.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ github.com/AzureAD/microsoft-authentication-library-for-go/apps/public
9393
# github.com/go-logr/logr v1.4.1
9494
## explicit; go 1.18
9595
github.com/go-logr/logr
96-
# github.com/golang-jwt/jwt/v4 v4.5.0
96+
# github.com/golang-jwt/jwt/v4 v4.5.0 => github.com/golang-jwt/jwt/v4 v4.5.2
9797
## explicit; go 1.16
9898
github.com/golang-jwt/jwt/v4
99-
# github.com/golang-jwt/jwt/v5 v5.2.0
99+
# github.com/golang-jwt/jwt/v5 v5.2.0 => github.com/golang-jwt/jwt/v5 v5.2.2
100100
## explicit; go 1.18
101101
github.com/golang-jwt/jwt/v5
102102
# github.com/google/uuid v1.5.0
@@ -137,3 +137,5 @@ k8s.io/klog/v2/internal/dbg
137137
k8s.io/klog/v2/internal/serialize
138138
k8s.io/klog/v2/internal/severity
139139
k8s.io/klog/v2/internal/sloghandler
140+
# github.com/golang-jwt/jwt/v4 => github.com/golang-jwt/jwt/v4 v4.5.2
141+
# github.com/golang-jwt/jwt/v5 => github.com/golang-jwt/jwt/v5 v5.2.2

0 commit comments

Comments
 (0)