Skip to content

Commit 0c3153d

Browse files
authored
Merge pull request #1906 from k8s-infra-cherrypick-robot/cherry-pick-1905-to-release-1.26
[release-1.26] fix: CVE-2025-30204
2 parents 9ff69b4 + 9a07392 commit 0c3153d

File tree

9 files changed

+86
-25
lines changed

9 files changed

+86
-25
lines changed

.trivyignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ CVE-2024-45336
22
CVE-2024-45341
33
CVE-2025-22866
44
CVE-2025-22870
5+
CVE-2025-30204

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ require (
9797
github.com/godbus/dbus/v5 v5.1.0 // indirect
9898
github.com/gofrs/uuid v4.4.0+incompatible // indirect
9999
github.com/gogo/protobuf v1.3.2 // indirect
100-
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
101-
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
100+
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
101+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
102102
github.com/google/btree v1.0.1 // indirect
103103
github.com/google/cadvisor v0.51.0 // indirect
104104
github.com/google/cel-go v0.22.0 // indirect

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
161161
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
162162
github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
163163
github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
164-
github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
165-
github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
166-
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
167-
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
164+
github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
165+
github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
166+
github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
167+
github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
168168
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
169169
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
170170
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=

vendor/github.com/golang-jwt/jwt/v4/parser.go

+33-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang-jwt/jwt/v5/README.md

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang-jwt/jwt/v5/SECURITY.md

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang-jwt/jwt/v5/parser.go

+33-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang-jwt/jwt/v5/token.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,10 @@ github.com/gogo/protobuf/gogoproto
263263
github.com/gogo/protobuf/proto
264264
github.com/gogo/protobuf/protoc-gen-gogo/descriptor
265265
github.com/gogo/protobuf/sortkeys
266-
# github.com/golang-jwt/jwt/v4 v4.5.1
266+
# github.com/golang-jwt/jwt/v4 v4.5.2
267267
## explicit; go 1.16
268268
github.com/golang-jwt/jwt/v4
269-
# github.com/golang-jwt/jwt/v5 v5.2.1
269+
# github.com/golang-jwt/jwt/v5 v5.2.2
270270
## explicit; go 1.18
271271
github.com/golang-jwt/jwt/v5
272272
# github.com/golang/protobuf v1.5.4

0 commit comments

Comments
 (0)