proxy_proto: fixing hashing bug#13768
Merged
lizan merged 9 commits intoenvoyproxy:masterfrom Nov 4, 2020
Merged
Conversation
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Contributor
Author
|
Also per @rchernobelskiy 's comment on the issue, can anyone think of a better way to avoid bugs of this type? I really dislike sizeof tests, but the best I can think of is a sizeof() test which best-effort catches new proxy protocol additions and suggests that we update the hash before adjusting the size. Any better ideas? |
lizan
reviewed
Oct 27, 2020
| const Network::ConnectionSocket::OptionsSharedPtr& options); | ||
| const Network::ConnectionSocket::OptionsSharedPtr& options, | ||
| Network::Address::InstanceConstSharedPtr source_address = | ||
| Network::Address::InstanceConstSharedPtr()); |
lizan
reviewed
Oct 27, 2020
| /** | ||
| * @return bool whether the transport socket will use proxy protocol options. | ||
| */ | ||
| virtual bool usesProxyProtocolOptions() const { return false; } |
Member
There was a problem hiding this comment.
tap transport socket would need return underlying transport socket value instead of false.
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Contributor
Author
|
Sorry, I think I need another stamp after merge |
lizan
previously approved these changes
Nov 3, 2020
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
lizan
approved these changes
Nov 4, 2020
|
Thanks you guys for the fix 🎉 |
Contributor
Author
|
@envoyproxy/stable-maintainers haven't reviewed the backport yet, but there's also not a set schedule for backport releases other than when we cut a CVE release. |
Contributor
|
I think it should be backported to 1.16 - starting this work. |
cpakulski
pushed a commit
to cpakulski/envoy
that referenced
this pull request
Nov 10, 2020
Fix a bug where the transport socket options for the first downstream got reused for subsequent upstream connections. Risk Level: low Testing: new integration test Docs Changes: n/a Release Notes: Platform Specific Features: Fixes envoyproxy#13659 Signed-off-by: Alyssa Wilk <alyssar@chromium.org> Signed-off-by: Christoph Pakulski <christoph@tetrate.io>
lizan
pushed a commit
that referenced
this pull request
Nov 11, 2020
Fix a bug where the transport socket options for the first downstream got reused for subsequent upstream connections. Risk Level: low Testing: new integration test Docs Changes: n/a Release Notes: Platform Specific Features: Fixes #13659 Signed-off-by: Alyssa Wilk <alyssar@chromium.org> Signed-off-by: Christoph Pakulski <christoph@tetrate.io>
guyco-redis
added a commit
to RedisLabs/envoy
that referenced
this pull request
Nov 11, 2020
* backport: Prevent SEGFAULT when disabling listener (envoyproxy#13515) (envoyproxy#13882) * Prevent SEGFAULT when disabling listener (envoyproxy#13515) This prevents the stop_listening overload action from causing segmentation faults that can occur if the action is enabled after the listener has already shut down. Signed-off-by: Alex Konradi <akonradi@google.com> Signed-off-by: Christoph Pakulski <christoph@tetrate.io> * backport to rel-1.16: proxy_proto - fixing hashing bug envoyproxy#13768 (envoyproxy#13966) Fix a bug where the transport socket options for the first downstream got reused for subsequent upstream connections. Risk Level: low Testing: new integration test Docs Changes: n/a Release Notes: Platform Specific Features: Fixes envoyproxy#13659 Signed-off-by: Alyssa Wilk <alyssar@chromium.org> Signed-off-by: Christoph Pakulski <christoph@tetrate.io> Co-authored-by: Christoph Pakulski <christoph@tetrate.io>
Contributor
|
Backported to 1.16. Removing |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Fix a bug where the transport socket options for the first downstream got reused for subsequent upstream connections.
Risk Level: low
Testing: new integration test
Docs Changes: n/a
Release Notes:
Platform Specific Features:
Fixes #13659