OCPBUGS-21471: [release-4.11] UPSTREAM: <carry>: [CVE-2023-39325] .: bump golang.org/x/net to v0.17.0 #1761
Conversation
openshift-ci-robot
added
the
backports/unvalidated-commits
|
@ncdc: the contents of this pull request could not be automatically validated. The following commits could not be validated and must be approved by a top-level approver:
Comment |
|
/retest |
Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>
|
@ncdc: the contents of this pull request could not be automatically validated. The following commits could not be validated and must be approved by a top-level approver:
Comment |
This change fully addresses CVE-2023-44487 and CVE-2023-39325 for the API server when the client is unauthenticated. The changes to util/runtime are required because otherwise a large number of requests can get blocked on the time.Sleep calls. For unauthenticated clients (either via 401 or the anonymous user), we simply no longer allow such clients to hold open http2 connections. They can use http2, but with the performance of http1 (with keep-alive disabled). Since this change has the potential to cause issues, the UnauthenticatedHTTP2DOSMitigation feature gate can be disabled to remove this protection (it is enabled by default). For example, when the API server is fronted by an L7 load balancer that is set up to mitigate http2 attacks, unauthenticated clients could force disable connection reuse between the load balancer and the API server (many incoming connections could share the same backend connection). An API server that is on a private network may opt to disable this protection to prevent performance regressions for unauthenticated clients. For all other clients, we rely on the golang.org/x/net fix in golang/net@b225e7c That change is not sufficient to adequately protect against a motivated client - future changes to Kube and/or golang.org/x/net will be explored to address this gap. The Kube API server now uses a max stream of 100 instead of 250 (this matches the Go http2 client default). This lowers the abuse limit from 1000 to 400. Signed-off-by: Monis Khan <mok@microsoft.com> (cherry picked from commit d40f08f)
… http1 tests These occasionally flake on CI: https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/121200/pull-kubernetes-unit-go-compatibility/1712589824344461312 === Failed === FAIL: vendor/k8s.io/apiserver/pkg/endpoints/filters TestUnauthenticatedHTTP2ClientConnectionClose/other_skip=true/http/1.1 (0.19s) authentication_test.go:653: expect TCP connection: 1, actual: 2 --- FAIL: TestUnauthenticatedHTTP2ClientConnectionClose/other_skip=true/http/1.1 (0.19s) === FAIL: vendor/k8s.io/apiserver/pkg/endpoints/filters TestUnauthenticatedHTTP2ClientConnectionClose/other_skip=true (0.23s) --- FAIL: TestUnauthenticatedHTTP2ClientConnectionClose/other_skip=true (0.23s) === FAIL: vendor/k8s.io/apiserver/pkg/endpoints/filters TestUnauthenticatedHTTP2ClientConnectionClose (2.30s) Signed-off-by: Monis Khan <mok@microsoft.com> (cherry picked from commit 2029344) Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>
|
@ncdc: the contents of this pull request could not be automatically validated. The following commits could not be validated and must be approved by a top-level approver:
Comment |
| @@ -196,6 +214,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS | |||
| ServerSideApply: {Default: true, PreRelease: featuregate.GA}, | |||
| StorageVersionHash: {Default: true, PreRelease: featuregate.Beta}, | |||
| StorageVersionAPI: {Default: false, PreRelease: featuregate.Alpha}, | |||
| UnauthenticatedHTTP2DOSMitigation: {Default: true, PreRelease: featuregate.Beta}, | |||
|
/lgtm going to approve the unvalidated commits. We've gone back past kube |
deads2k
added
backports/validated-commits
openshift-ci
bot
added
lgtm
deads2k
added
cherry-pick-approved
Adjust test that was added to work with go 1.18 Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>
openshift-ci-robot
added
backports/unvalidated-commits
|
@ncdc: the contents of this pull request could not be automatically validated. The following commits could not be validated and must be approved by a top-level approver:
Comment |
|
/lgtm |
deads2k
added
backports/validated-commits
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: deads2k, ncdc The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
ncdc
changed the title
openshift-ci-robot
added
the
jira/valid-reference
|
@ncdc: This pull request references Jira Issue OCPBUGS-21471, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. Retaining the jira/valid-bug label as it was manually added. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
/test k8s-e2e-gcp rpmbuild flake |
|
/retest |
openshift-ci
bot
merged commit ec2a592
into
openshift:release-4.11
|
@ncdc: Jira Issue OCPBUGS-21471: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-21471 has been moved to the MODIFIED state. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
Fix included in accepted release 4.11.0-0.nightly-2023-10-14-102406 |
/kind bug
What this PR does / why we need it:
Bumping golang.org/x/net in light of CVE-2023-39325 and CVE-2023-44487.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Does this PR introduce a user-facing change?
Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.: