release-1.26: Backport #5827 and #5850 #5851
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
An additional mitigation to CVE-2023-44487 available in Envoy 1.27.1. This change allows configuring the http.max_requests_per_io_cycle Envoy runtime setting via Contour configuration to allow administrators of Contour to prevent abusive connections from starving resources from others. The default is left as the existing behavior, that is no limit, so as not to impact existing valid traffic. See the Envoy release notes for more information: https://www.envoyproxy.io/docs/envoy/v1.27.1/version_history/v1.27/v1.27.1 Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
sunjayBhatia
added
the
release-note/none-required
sunjayBhatia
requested review from
stevesloka,
skriss and
tsaarni
and removed request for
a team
sunjayBhatia
commented
Oct 13, 2023
pkg/config/parameters.go
Outdated
| // I/O cycles. Can be used as a mitigation for CVE-2023-44487 when abusive traffic is | ||
| // detected. Configures the http.max_requests_per_io_cycle Envoy runtime setting. The default | ||
| // value when this is not set is no limit. | ||
| MaxRequestsPerIOCycle *uint32 `yaml:"max-requests-per-io-cycle"` |
There was a problem hiding this comment.
this ends up being a new configuration field available if we do backport this (and other following) change
worth a discussion whether this is desirable or we should only include this new mitigation/feature in the latest release
There was a problem hiding this comment.
Envoy also ended up introducing this new configuration in backports, which is maybe bit unusual, but I do not have strong opinion. It sounds ok for me.
That said, the Envoy version needs to get bumped. I guess to each respective release tracks according to https://projectcontour.io/resources/compatibility-matrix/ vs GHSA-jhv4-f7mr-xx76. Edit: sorry I missed it was already done #5823 😄
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## release-1.26 #5851 +/- ##
================================================
+ Coverage 78.56% 78.58% +0.02%
================================================
Files 138 138
Lines 19163 19195 +32
================================================
+ Hits 15056 15085 +29
- Misses 3820 3823 +3
Partials 287 287
|
Adds a global Listener configuration field for admins to be able to protect their installations of Contour/Envoy with a limit. Default is no limit to ensure existing behavior is not impacted for valid traffic. This field can be used for tuning resource usage or mitigated DOS attacks like in CVE-2023-44487. Also fixes omitempty tags on MaxRequestsPerIOCycle field. Fixes: projectcontour#5846 Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
tsaarni
approved these changes
Oct 16, 2023
sunjayBhatia
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Commit messages:
An additional mitigation to CVE-2023-44487 available in Envoy 1.27.1. This change allows configuring the http.max_requests_per_io_cycle Envoy runtime setting via Contour configuration to allow administrators of Contour to prevent abusive connections from starving resources from others. The default is left as the existing behavior, that is no limit, so as not to impact existing valid traffic.
See the Envoy release notes for more information:
https://www.envoyproxy.io/docs/envoy/v1.27.1/version_history/v1.27/v1.27.1
HTTP/2 max concurrent streams can be configured (#5850)
Adds a global Listener configuration field for admins to be able to
protect their installations of Contour/Envoy with a limit. Default is no
limit to ensure existing behavior is not impacted for valid traffic.
This field can be used for tuning resource usage or mitigated DOS
attacks like in CVE-2023-44487.