fix: Ignore ports in host headers when matching against HTTPRoute hostnames #1702
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
jackkleeman
force-pushed
the
virtualhost2
branch
from
fa52f01
to
b6e483d
Compare
|
cc @arkodg |
jackkleeman
force-pushed
the
virtualhost2
branch
from
b6e483d
to
413ce4c
Compare
jackkleeman
commented
Jul 24, 2023
internal/cmd/egctl/testdata/translate/in/envoy-patch-policy.yaml
Outdated
Show resolved
Hide resolved
jackkleeman
commented
Jul 24, 2023
Codecov Report
@@ Coverage Diff @@
## main #1702 +/- ##
==========================================
- Coverage 65.17% 65.10% -0.08%
==========================================
Files 84 84
Lines 12230 12230
==========================================
- Hits 7971 7962 -9
- Misses 3751 3759 +8
- Partials 508 509 +1
|
arkodg
reviewed
Aug 11, 2023
arkodg
reviewed
Aug 11, 2023
arkodg
reviewed
Aug 11, 2023
jackkleeman
force-pushed
the
virtualhost2
branch
3 times, most recently
from
a9535b4
to
456eab0
Compare
arkodg
reviewed
Aug 15, 2023
| @@ -80,7 +80,7 @@ func (c *XDSHookClient) PostRouteModifyHook(route *routeV3.Route, routeHostnames | |||
| func (c *XDSHookClient) PostVirtualHostModifyHook(vh *routeV3.VirtualHost) (*routeV3.VirtualHost, error) { | |||
| // Only make the change when the VirtualHost's name matches the expected testdata | |||
| // This prevents us from having to update every single testfile.out | |||
| if vh.Name == "extension-post-xdsvirtualhost-hook-error" { | |||
| if vh.Name == "extension-post-xdsvirtualhost-hook-error-*" { | |||
arkodg
reviewed
Aug 15, 2023
arkodg
reviewed
Aug 15, 2023
arkodg
reviewed
Aug 15, 2023
arkodg
reviewed
Aug 15, 2023
arkodg
reviewed
Aug 17, 2023
arkodg
reviewed
Aug 17, 2023
|
few minor comments, overall LGTM, thanks for hanging in there, and bringing clarity on precedence matching ! |
arkodg
reviewed
Aug 17, 2023
arkodg
reviewed
Aug 17, 2023
Signed-off-by: Jack Kleeman <jackkleeman@gmail.com>
Signed-off-by: Jack Kleeman <jackkleeman@gmail.com>
Signed-off-by: Jack Kleeman <jackkleeman@gmail.com>
Signed-off-by: Jack Kleeman <jackkleeman@gmail.com>
Signed-off-by: Jack Kleeman <jackkleeman@gmail.com>
Signed-off-by: Jack Kleeman <jackkleeman@gmail.com>
Signed-off-by: Jack Kleeman <jackkleeman@gmail.com>
jackkleeman
force-pushed
the
virtualhost2
branch
from
728b9ac
to
d0dc313
Compare
arkodg
requested review from
a team,
zhaohuabing,
chauhanshubham and
Xunzhuo
and removed request for
a team
|
great thanks, please merge when you're happy |
|
waiting for a LGTM from another reviewer |
zirain
approved these changes
Aug 19, 2023
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.
What type of PR is this?
fix
What this PR does / why we need it:
We need to be able to match on hostnames in httproute (that are more specific than hostnames in the listener) while also ignoring ports in host headers. Currently we do not ignore ports, and there is no workaround because hostnames may not contain ports, and nor can headermatch values. There are two approaches to solving this:
This PR is the second approach
NB: This PR does not allow 'fallthrough' from one route hostname to a less specific one (eg from google.com to *.com) when there is no match for the first hostname, as envoy does not fall through after a virtual host is selected. This is a breaking change of behaviour as currently the less specific matcher will simply come later in the list of routes under the same virtual host. However, this is moving in line with the spec as discussed in kubernetes-sigs/gateway-api#2294
Which issue(s) this PR fixes:
Fixes #1687