Merge pull request #2537 from 2uasimojo/HIVE-2711/mce-2.6/http-cve

Bump x/net for http DoS CVE
openshift · Dec 20, 2024 · 3f49f26 · 3f49f26
2 parents ee7cc1c + aae41be
commit 3f49f26
Show file tree

Hide file tree

Showing 37 changed files with 1,782 additions and 604 deletions.
diff --git a/apis/go.mod b/apis/go.mod
@@ -19,7 +19,7 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect

diff --git a/apis/go.sum b/apis/go.sum
@@ -172,8 +172,8 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
-golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

diff --git a/apis/vendor/golang.org/x/net/LICENSE b/apis/vendor/golang.org/x/net/LICENSE
diff --git a/apis/vendor/golang.org/x/net/http2/client_conn_pool.go b/apis/vendor/golang.org/x/net/http2/client_conn_pool.go
diff --git a/apis/vendor/golang.org/x/net/http2/config.go b/apis/vendor/golang.org/x/net/http2/config.go
diff --git a/apis/vendor/golang.org/x/net/http2/config_go124.go b/apis/vendor/golang.org/x/net/http2/config_go124.go
diff --git a/apis/vendor/golang.org/x/net/http2/config_pre_go124.go b/apis/vendor/golang.org/x/net/http2/config_pre_go124.go
diff --git a/apis/vendor/golang.org/x/net/http2/frame.go b/apis/vendor/golang.org/x/net/http2/frame.go