router: auto_host_rewrite_header support#7220
Merged
mattklein123 merged 4 commits intoenvoyproxy:masterfrom Jun 14, 2019
Merged
router: auto_host_rewrite_header support#7220mattklein123 merged 4 commits intoenvoyproxy:masterfrom
mattklein123 merged 4 commits intoenvoyproxy:masterfrom
Conversation
Signed-off-by: Bartosz Borkowski <bartebor@wp.pl>
zuercher
requested changes
Jun 10, 2019
Member
zuercher
left a comment
There was a problem hiding this comment.
Thanks! This needs some minor changes, but otherwise looks good.
source/common/config/rds_json.cc
Outdated
|
|
||
| JSON_UTIL_SET_STRING(json_route, *action, prefix_rewrite); | ||
|
|
||
| int host_rewrite_options = 0; |
Member
There was a problem hiding this comment.
Please revert this file. We no longer add new features to the v1 API.
source/common/json/config_schemas.cc
Outdated
| "prefix_rewrite" : {"type" : "string"}, | ||
| "host_rewrite" : {"type" : "string"}, | ||
| "auto_host_rewrite" : {"type" : "boolean"}, | ||
| "auto_host_rewrite_header" : {"type" : "string"}, |
Member
There was a problem hiding this comment.
Likewise, this schema is for the v1 api and should be reverted.
source/common/router/config_impl.cc
Outdated
| if (header != nullptr) { | ||
| absl::string_view headerValue = header->value().getStringView(); | ||
| if (!headerValue.empty()) { | ||
| headers.Host()->value(std::string(headerValue)); |
Member
There was a problem hiding this comment.
You can leave out the temporary std::string and just pass headerValue directly to
HeaderEntry::value(absl::string_view) which will copy the string.
Signed-off-by: Bartosz Borkowski <bartebor@wp.pl>
Contributor
Author
|
@zuercher, thanks for the review! |
zuercher
previously approved these changes
Jun 11, 2019
mattklein123
requested changes
Jun 13, 2019
Member
mattklein123
left a comment
There was a problem hiding this comment.
LGTM with tiny nit. Thank you!
/wait
source/common/router/config_impl.cc
Outdated
| } else if (auto_host_rewrite_header_) { | ||
| Http::HeaderEntry* header = headers.get(*auto_host_rewrite_header_); | ||
| if (header != nullptr) { | ||
| absl::string_view headerValue = header->value().getStringView(); |
Contributor
Author
There was a problem hiding this comment.
My Java background is showing... fixed.
…eader Signed-off-by: Bartosz Borkowski <bartebor@wp.pl>
Signed-off-by: Bartosz Borkowski <bartebor@wp.pl>
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
3 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.
Description: Make it possible to substitute upstream's request
host/:authorityheader with value of any (downstream or custom) header. This allows for efficient implementation of more involving deployments with specially configured downstream load balancers.Risk Level: Low, does not change default behaviour
Testing: Unit tests added
Docs Changes: Description in proto file
Release Notes: Updated
Fixes #6486