fix: prevent policies targeting non-TLS listeners on the same port from conflicting by liorokman · Pull Request #2786 · envoyproxy/gateway

liorokman · 2024-03-05T12:58:57Z

What this PR does / why we need it:

Validate that multiple policies that affect listener configuration don't map to the same listener filter chain.
Change the XDS listener generation so that instead of defaultFilterChain for non-TLS routes, a filterChain with a destinationPort matcher is used. This allows multiple policies attached to non-TLS listeners that differ on the destination port to provide different policies without conflicting.

Which issue(s) this PR fixes:
Fixes #2742

codecov · 2024-03-05T15:38:34Z

Codecov Report

Attention: Patch coverage is 96.38554% with 3 lines in your changes are missing coverage. Please review.

Project coverage is 64.18%. Comparing base (01a123a) to head (36aefe5).

Files	Patch %	Lines
internal/gatewayapi/securitypolicy.go	90.90%	2 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2786      +/-   ##
==========================================
+ Coverage   64.05%   64.18%   +0.13%     
==========================================
  Files         124      124              
  Lines       20931    21007      +76     
==========================================
+ Hits        13407    13483      +76     
  Misses       6671     6671              
  Partials      853      853

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

arkodg · 2024-03-05T18:20:53Z

thanks for working on this @liorokman, since this is a pretty big change in terms of how xds is generated, this is unlikely to make it into v1.0.0, will take a closer look at the PR soon

guydc · 2024-03-06T11:25:22Z

internal/xds/translator/listener.go

raised in yesterday's community meeting: when matching on the destination port, wouldn't there be a dedicated envoy listener that's already bound to that distinct port? meaning, for port-based matching, the default filter chain can still be used and there's no need to additionally do a filter chain match?

I could have used defaultFilterChain for the first port and created a distinct chain for any other port. That would technically work, but it would complicate the code needlessly to treat the first and any later non-TLS listeners differently. This way, it all works the same.

arkodg · 2024-03-06T23:24:16Z

hey @liorokman, @guydc, @zhaohuabing and I discussed this issue in the community meeting yesterday, and prefer if we just partially rejected/skipped the policy if we detected this condition w/o changing any xds translation.
It may be easier to implement first policy wins, and partially reject the second policy for this listener (similar to the overlap condition)
I had also raised this issue in the envoy slack channel, but didn't find a solution
https://envoyproxy.slack.com/archives/C78M4KW76/p1709687283123669

liorokman · 2024-03-07T06:09:50Z

It's not possible to reject or partially accept the second policy in this case because the problem is in the XDS translation and not the IR translation. The IR translation doesn't have an issue - when examining the IR for the listener that is actually targeted by a policy there is no conflict. The conflict occurs because the XDS translation mashes multiple IRs into the same defaultFilterContext.

In other words - it's not that two policies are in conflict with each other. It's that one single policy is asked to target a specific Listener and ends up affecting more than that.

Instead, the PR right now rejects policies that would affect listeners that they weren't the target of.

I made the XDS translation change because that way I could accept more policies. Instead of declining to accept all policies targeting non-TLS listeners and routes attached to non-TLS listeners, the PR right now makes it possible to accept policies that don't target the same port.

liorokman · 2024-03-07T14:26:41Z

Based on @guydc 's insight - no need to change the defaultFilterChain translation since a new listener is created anyways per port. I reverted that part of the patch.

What remains is that if a policy (either SecurityPolicy or ClientTrafficPolicy) is applied that would affect more than the listener that it was attached to, then the policy will be rejected.

arkodg · 2024-03-07T22:16:20Z

@liorokman there is existing logic there checks for conflicts using a policyMap https://github.com/envoyproxy/gateway/blob/e4aea1b6e51f1a3810345e34cba4e39a94bbb5bb/internal/gatewayapi/clienttrafficpolicy.go#L72

do you think we should reuse that style, and add a httpOnlyMap that can make sure no 2 policies can affect the same http only port ?

I dont think we need to include mergeGateways since that feature has already kicked in earlier in the routing level and flattened all gateway listeners into IR listeners associated with a single key (per gatewayclass)

liorokman · 2024-03-08T10:32:09Z

I dont think we need to include mergeGateways since that feature has already kicked in earlier in the routing level and flattened all gateway listeners into IR listeners associated with a single key (per gatewayclass)

Good point. Fixed.

liorokman · 2024-03-08T10:49:21Z

@liorokman there is existing logic there checks for conflicts using a policyMap
do you think we should reuse that style, and add a httpOnlyMap that can make sure no 2 policies can affect the same http only port ?

I tried to do this, and it didn't end up being any simpler to read. Is this critical?

arkodg · 2024-03-09T00:23:54Z

@liorokman there is existing logic there checks for conflicts using a policyMap
do you think we should reuse that style, and add a httpOnlyMap that can make sure no 2 policies can affect the same http only port ?

I tried to do this, and it didn't end up being any simpler to read. Is this critical?

it helps keep the code and corresponding status (Accepted=False with Conflicted Reason) in the same place.
The current code checks that 2 policies cannot target the same section i.e. listener, this case is a variant where 2 policies cannot target the same http port

liorokman · 2024-03-09T06:07:40Z

@liorokman there is existing logic there checks for conflicts using a policyMap
do you think we should reuse that style, and add a httpOnlyMap that can make sure no 2 policies can affect the same http only port ?

I tried to do this, and it didn't end up being any simpler to read. Is this critical?

it helps keep the code and corresponding status (Accepted=False with Conflicted Reason) in the same place. The current code checks that 2 policies cannot target the same section i.e. listener, this case is a variant where 2 policies cannot target the same http port

The current code that checks that 2 policies cannot target the same section doesn't have to look at information from inside the listener(s) identified by that section. It can do its job by looking at the strings in the policy itself.

To determine the port(s) targeted by a single policy document, the code needs to find the actual listener, or multiple listeners in the case where the policy attaches to an entire Gateway. We actually already have code that does this - the translation functions where the current PR does the validation.

Moving the check from the place where all of the information to do the validation exists to where this information doesn't yet exist would more or less duplicate the code from the translation functions. Is this your preference?

arkodg · 2024-03-09T21:05:39Z

Moving the check from the place where all of the information to do the validation exists to where this information doesn't yet exist would more or less duplicate the code from the translation functions. Is this your preference?

hoping others can chime in here as well, my preference would be to separate translation from validation, so the method could be called after getting the IR context before calling translate

also would be great if this layer did not have any envoyisms in the gateway-api layer, although we are in this situation because of the limitation in Envoy proxy, would be great to highlight that as a code comment, but use a more generic name (instead of ShareEnvoyFilterChain) for the helper method

liorokman · 2024-03-11T08:26:35Z

Moving the check from the place where all of the information to do the validation exists to where this information doesn't yet exist would more or less duplicate the code from the translation functions. Is this your preference?

hoping others can chime in here as well, my preference would be to separate translation from validation, so the method could be called after getting the IR context before calling translate

also would be great if this layer did not have any envoyisms in the gateway-api layer, although we are in this situation because of the limitation in Envoy proxy, would be great to highlight that as a code comment, but use a more generic name (instead of ShareEnvoyFilterChain) for the helper method

I split the validation away from the translation, and renamed the ShareEnvoyFilterChain function to something a little more generic.

arkodg · 2024-03-12T04:53:07Z

internal/gatewayapi/clienttrafficpolicy.go

can this be also shared with SecurityPolicy and moved into helpers.go ?

Not easily. CTP is listener oriented, while SP is route oriented. The way that the correct listener is found is different in each of these validation methods.

arkodg

LGTM thanks !

…don't map to the same listener filter chain. * Change the XDS listener generation so that instead of defaultFilterChain for non-TLS routes, a filterChain with a destinationPort matcher is used. This allows multiple policies attached to non-TLS listeners that differ on the destination port to provide different policies without conflicting. Signed-off-by: Lior Okman <[email protected]>

Signed-off-by: Lior Okman <[email protected]>

anyways for each port. Signed-off-by: Lior Okman <[email protected]>

Signed-off-by: Lior Okman <[email protected]>

Renamed the helper method to a more generic name. Signed-off-by: Lior Okman <[email protected]>

…om conflicting (envoyproxy#2786) * * Validate that multiple policies that affect listener configuration don't map to the same listener filter chain. * Change the XDS listener generation so that instead of defaultFilterChain for non-TLS routes, a filterChain with a destinationPort matcher is used. This allows multiple policies attached to non-TLS listeners that differ on the destination port to provide different policies without conflicting. Signed-off-by: Lior Okman <[email protected]> * Make hostname based routing work again for non-TLS listeners Signed-off-by: Lior Okman <[email protected]> * Fixed testdata for egctl Signed-off-by: Lior Okman <[email protected]> * Make the linter happy Signed-off-by: Lior Okman <[email protected]> * Added a unit-test Signed-off-by: Lior Okman <[email protected]> * Make the linter happy Signed-off-by: Lior Okman <[email protected]> * Update an e2e test with the new filterChain patch Signed-off-by: Lior Okman <[email protected]> * Revert changing the XDS translation, since a new listener is created anyways for each port. Signed-off-by: Lior Okman <[email protected]> * Also revert the xds change in the e2e test. Signed-off-by: Lior Okman <[email protected]> * Don't need to go over the full XDSIR map - just the current gateway. Signed-off-by: Lior Okman <[email protected]> * Refactored to separate the validation and the translation. Renamed the helper method to a more generic name. Signed-off-by: Lior Okman <[email protected]> --------- Signed-off-by: Lior Okman <[email protected]> Co-authored-by: Guy Daich <[email protected]>

* ci: update cherry-pick v1.0.0 (#2784) Signed-off-by: bitliu <[email protected]> * fix: add missing release notes details and re organize it (#2785) fix: complete missing release notes and re organize it Signed-off-by: bitliu <[email protected]> * e2e: backend upgrade test (#2725) * chore: add testdata to passive health checks (#2788) * chore: add testdata to passive health checks Signed-off-by: yeedove <[email protected]> * fix test Signed-off-by: yeedove <[email protected]> --------- Signed-off-by: yeedove <[email protected]> * promote: guydc as maintainer (#2794) Signed-off-by: bitliu <[email protected]> * fix: Delete unused status keys from watchable (#2782) * Delete unused status keys in gatewayapi-runner Signed-off-by: Yuneui Jeong <[email protected]> * Delete unused status keys in xds-translator runner Signed-off-by: Yuneui Jeong <[email protected]> * Add tests and fix code to pass all tests Signed-off-by: Yuneui Jeong <[email protected]> * Cover more Signed-off-by: Yuneui <[email protected]> * Change struct's name and other minor fixes Signed-off-by: Yuneui Jeong <[email protected]> --------- Signed-off-by: Yuneui Jeong <[email protected]> Signed-off-by: Yuneui <[email protected]> * docs: fix commands in basic auth example (#2791) Signed-off-by: Arko Dasgupta <[email protected]> * feat: Support WellKnownSystemCerts in BackendTLSPolicy (#2804) * Add support for using the system truststore with upstream TLS. Signed-off-by: Lior Okman <[email protected]> * Make the linter happy Signed-off-by: Lior Okman <[email protected]> --------- Signed-off-by: Lior Okman <[email protected]> * docs: refactor user guides (#2797) * docs: refactor user guides Signed-off-by: bitliu <[email protected]> * fix: relative paths Signed-off-by: bitliu <[email protected]> --------- Signed-off-by: bitliu <[email protected]> * Fix gen check (#2814) * fix: gen-check error Signed-off-by: bitliu <[email protected]> * run lint for docs Signed-off-by: bitliu <[email protected]> --------- Signed-off-by: bitliu <[email protected]> * refactor: set instead of map for mergeGateways (#2803) * refactor:set[T] instead of map[T]bool Signed-off-by: Dennis Zhou <[email protected]> * fix lint Signed-off-by: Dennis Zhou <[email protected]> --------- Signed-off-by: Dennis Zhou <[email protected]> Co-authored-by: Xunzhuo <[email protected]> * remove: support for hostnetwork (#2815) * feat(egctl): add support for egctl to translate from gateway-api resources to IR (#2799) * Added an option to translate to IR representation. Signed-off-by: Lior Okman <[email protected]> * Added a unit test, and made sure that existing services have an IP address. Signed-off-by: Lior Okman <[email protected]> * Add omitempty where needed. Signed-off-by: Lior Okman <[email protected]> * Make gen-check happy Signed-off-by: Lior Okman <[email protected]> * Added some documentation. Signed-off-by: Lior Okman <[email protected]> --------- Signed-off-by: Lior Okman <[email protected]> * docs: basic auth example use https (#2806) * docs: basic auth example use https Signed-off-by: phantooom <[email protected]> * docs: refactor user guides (#2797) * docs: refactor user guides Signed-off-by: bitliu <[email protected]> * fix: relative paths Signed-off-by: bitliu <[email protected]> --------- Signed-off-by: bitliu <[email protected]> Signed-off-by: phantooom <[email protected]> * Fix gen check (#2814) * fix: gen-check error Signed-off-by: bitliu <[email protected]> * run lint for docs Signed-off-by: bitliu <[email protected]> --------- Signed-off-by: bitliu <[email protected]> Signed-off-by: phantooom <[email protected]> * refactor: set instead of map for mergeGateways (#2803) * refactor:set[T] instead of map[T]bool Signed-off-by: Dennis Zhou <[email protected]> * fix lint Signed-off-by: Dennis Zhou <[email protected]> --------- Signed-off-by: Dennis Zhou <[email protected]> Co-authored-by: Xunzhuo <[email protected]> Signed-off-by: phantooom <[email protected]> * Update site/content/en/latest/user/security/basic-auth.md Co-authored-by: Huabing Zhao <[email protected]> Signed-off-by: zou rui <[email protected]> --------- Signed-off-by: phantooom <[email protected]> Signed-off-by: bitliu <[email protected]> Signed-off-by: Dennis Zhou <[email protected]> Signed-off-by: zou rui <[email protected]> Co-authored-by: Xunzhuo <[email protected]> Co-authored-by: Dennis Zhou <[email protected]> Co-authored-by: Huabing Zhao <[email protected]> * chore: group go.opentelemetry.io dependabot (#2821) Signed-off-by: zirain <[email protected]> * Add referenced BackendRefs for ExtAuth to Resource Tree (#2795) * add referenced BackendRefs for ExtAuth to Resource Tree Signed-off-by: huabing zhao <[email protected]> * clean up the controller code Signed-off-by: huabing zhao <[email protected]> * minor changes Signed-off-by: huabing zhao <[email protected]> * return errors Signed-off-by: huabing zhao <[email protected]> * fix validate error Signed-off-by: huabing zhao <[email protected]> * fix gen Signed-off-by: huabing zhao <[email protected]> * Support BackendTLSPolicy for the Ext HTTP/GRPC auth service Signed-off-by: huabing zhao <[email protected]> * fix lint Signed-off-by: huabing zhao <[email protected]> * fix gen Signed-off-by: huabing zhao <[email protected]> * check cross-ns reference grant Signed-off-by: huabing zhao <[email protected]> * fix test Signed-off-by: huabing zhao <[email protected]> * fix test Signed-off-by: huabing zhao <[email protected]> --------- Signed-off-by: huabing zhao <[email protected]> * fix bootstrap merge (#2801) * fix bootstrap merge Signed-off-by: zirain <[email protected]> * refactor validateBootstrap Signed-off-by: zirain <[email protected]> * lint Signed-off-by: zirain <[email protected]> * update test Signed-off-by: zirain <[email protected]> --------- Signed-off-by: zirain <[email protected]> * fix: skip the ReasonTargetNotFound for all policies (#2802) * stop populating ReasonTargetNotFound for all the policies Signed-off-by: shawnh2 <[email protected]> * add test to ensure the status is expected Signed-off-by: shawnh2 <[email protected]> * fix gen-check and lint Signed-off-by: shawnh2 <[email protected]> --------- Signed-off-by: shawnh2 <[email protected]> * docs: update EnvoyProxy logs (#2822) * docs: update EnvoyProxy logs Signed-off-by: zirain <[email protected]> * lint Signed-off-by: zirain <[email protected]> --------- Signed-off-by: zirain <[email protected]> * fix: omit default replicas on Kubernetes Deployment (#2816) * fix: remove default replicas function Signed-off-by: Ardika Bagus <[email protected]> * chore: omit replicas because nil equal to 1 by default Signed-off-by: Ardika Bagus <[email protected]> * chore: add a note when a user is being explicit on deployment replicas Signed-off-by: Ardika Bagus <[email protected]> --------- Signed-off-by: Ardika Bagus <[email protected]> * bug: compute endpointType for all protocol types (#2833) Fixes: #2832 Signed-off-by: Arko Dasgupta <[email protected]> * docs: Routing outside k8s (#2831) * docs: Routing outside k8s Fixes: #2482 Signed-off-by: Arko Dasgupta <[email protected]> * updates Signed-off-by: Arko Dasgupta <[email protected]> --------- Signed-off-by: Arko Dasgupta <[email protected]> * build(deps): bump google.golang.org/protobuf from 1.32.0 to 1.33.0 (#2825) Bumps google.golang.org/protobuf from 1.32.0 to 1.33.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump golang.org/x/net from 0.21.0 to 0.22.0 (#2826) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.21.0 to 0.22.0. - [Commits](golang/net@v0.21.0...v0.22.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (#2827) Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.4 to 1.9.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](stretchr/testify@v1.8.4...v1.9.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix: failed to create envoy-oidc-hmac secret when upgrading EG (#2835) try to create every secret instead of returning eraly Signed-off-by: huabing zhao <[email protected]> * build(deps): bump google.golang.org/grpc from 1.62.0 to 1.62.1 (#2829) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.62.0 to 1.62.1. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.62.0...v1.62.1) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Ext auth e2e tests (#2830) * e2e tests for http ext auth Signed-off-by: huabing zhao <[email protected]> * export util methods to avoid unparam link issues Signed-off-by: huabing zhao <[email protected]> * fixt test Signed-off-by: Huabing Zhao <[email protected]> --------- Signed-off-by: huabing zhao <[email protected]> Signed-off-by: Huabing Zhao <[email protected]> * fix existing secret check (#2838) fix existing secret Signed-off-by: zirain <[email protected]> * ci: update k8s matrix (#2836) * ci: update k8s matrix Signed-off-by: zirain <[email protected]> * v1.26.14 Signed-off-by: zirain <[email protected]> * nit Signed-off-by: zirain <[email protected]> * update matrix Signed-off-by: zirain <[email protected]> * link in quickstart Signed-off-by: zirain <[email protected]> * update Signed-off-by: zirain <[email protected]> * 1.29.2 Signed-off-by: zirain <[email protected]> --------- Signed-off-by: zirain <[email protected]> * e2e: try to fix client timeout flakes (#2812) * chore: client timeout log Signed-off-by: zirain <[email protected]> * add EnvoyProxy extra args Signed-off-by: zirain <[email protected]> * add E2E_CLEANUP Signed-off-by: zirain <[email protected]> * nit Signed-off-by: zirain <[email protected]> --------- Signed-off-by: zirain <[email protected]> * feat: Support Upstream TLS to multiple Backends (#2818) * Use transport_socket_matches to setup correct sockets for different destinations. Signed-off-by: Lior Okman <[email protected]> * Support Proxy Protocol for TLS upstreams. Signed-off-by: Lior Okman <[email protected]> * Changed the name generated for each transport match to be more inline with other names used in other places in xDS. Signed-off-by: Lior Okman <[email protected]> * Added one more case in the unit-test to show that upstream proxy-protocol still works. Signed-off-by: Lior Okman <[email protected]> --------- Signed-off-by: Lior Okman <[email protected]> * e2e: move drain settings into shutdown settings (#2850) Signed-off-by: Arko Dasgupta <[email protected]> * docs: mtls to the gateway (#2851) * docs: mtls to the gateway Signed-off-by: Arko Dasgupta <[email protected]> * edits Signed-off-by: Arko Dasgupta <[email protected]> * add ref Signed-off-by: Arko Dasgupta <[email protected]> * typo Signed-off-by: Arko Dasgupta <[email protected]> --------- Signed-off-by: Arko Dasgupta <[email protected]> * ignore finalizers when comparing envoy proxy svc (#2856) * ignore finalizers when comparing envoy proxy svc Fixes: #1820 Signed-off-by: Arko Dasgupta <[email protected]> * Chore: remove the uncessary allAssociatedRefGrants from resourceMappings (#2843) * modify oidc docs Signed-off-by: huabing zhao <[email protected]> * clear allAssociatedRefGrants Signed-off-by: huabing zhao <[email protected]> * address comments Signed-off-by: huabing zhao <[email protected]> --------- Signed-off-by: huabing zhao <[email protected]> * docs: allow users to configure custom certs for control plane auth (#2847) Signed-off-by: zirain <[email protected]> * add e2e tests for ext auth with grpc auth service (#2841) * add e2e tests for ext auth with grpc auth service Signed-off-by: huabing zhao <[email protected]> * add BackedTLSPolicy Signed-off-by: huabing zhao <[email protected]> * generate TLS socket for ext auth services Signed-off-by: huabing zhao <[email protected]> --------- Signed-off-by: huabing zhao <[email protected]> * fix: Address race condition disrupting graceful shutdown process (#2864) Signed-off-by: David Alger <[email protected]> * docs: move Design docs under "Get Involved" (#2857) * docs: move Design docs under "Get Involved" * design docs are more relevant to internal contributors than external users Signed-off-by: Arko Dasgupta <[email protected]> * fix links Signed-off-by: Arko Dasgupta <[email protected]> --------- Signed-off-by: Arko Dasgupta <[email protected]> * e2e: backend TLS policy (#2853) * start backendtls test Signed-off-by: Guy Daich <[email protected]> * fix lint Signed-off-by: Guy Daich <[email protected]> * use better name for egSetup(...) Signed-off-by: Guy Daich <[email protected]> * add negative test Signed-off-by: Guy Daich <[email protected]> * use static certs for test Signed-off-by: Guy Daich <[email protected]> --------- Signed-off-by: Guy Daich <[email protected]> * Update the user doc for OIDC (#2778) * user doc for oidc Signed-off-by: huabing zhao <[email protected]> * address comments Signed-off-by: huabing zhao <[email protected]> --------- Signed-off-by: huabing zhao <[email protected]> * add ADOPTERS.md (#2865) ADOPTERS.md Signed-off-by: huabing zhao <[email protected]> Co-authored-by: Xunzhuo <[email protected]> * build(deps): bump softprops/action-gh-release from 1 to 2 (#2867) Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2. - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](softprops/action-gh-release@de2c0eb...d99959e) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump github.com/bufbuild/buf from 1.29.0 to 1.30.0 in /tools/src/buf (#2870) build(deps): bump github.com/bufbuild/buf in /tools/src/buf Bumps [github.com/bufbuild/buf](https://github.com/bufbuild/buf) from 1.29.0 to 1.30.0. - [Release notes](https://github.com/bufbuild/buf/releases) - [Changelog](https://github.com/bufbuild/buf/blob/main/CHANGELOG.md) - [Commits](bufbuild/buf@v1.29.0...v1.30.0) --- updated-dependencies: - dependency-name: github.com/bufbuild/buf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump github.com/prometheus/common from 0.49.0 to 0.50.0 (#2871) Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.49.0 to 0.50.0. - [Release notes](https://github.com/prometheus/common/releases) - [Commits](prometheus/common@v0.49.0...v0.50.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump fortio.org/fortio from 1.63.3 to 1.63.4 (#2873) Bumps [fortio.org/fortio](https://github.com/fortio/fortio) from 1.63.3 to 1.63.4. - [Release notes](https://github.com/fortio/fortio/releases) - [Commits](fortio/fortio@v1.63.3...v1.63.4) --- updated-dependencies: - dependency-name: fortio.org/fortio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add tetrate to adopters (#2874) add tetrate to adopters Signed-off-by: huabing zhao <[email protected]> * fix: Don't override the ALPN array if HTTP/3 is enabled. (#2876) * Don't override the ALPN array if HTTP/3 is enabled. Signed-off-by: Lior Okman <[email protected]> * Removed the unneeded CEL validation for HTTP/3 and ALPN, as well as the CEL tests. Signed-off-by: Lior Okman <[email protected]> * Also regenerate the CRD. Signed-off-by: Lior Okman <[email protected]> --------- Signed-off-by: Lior Okman <[email protected]> * [e2e] eg release upgrade test (#2862) * [e2e] eg release upgrade test Signed-off-by: Alexander Volchok <[email protected]> * fixing linit Signed-off-by: Alexander Volchok <[email protected]> * Update test/e2e/tests/eg_upgrade.go Co-authored-by: zirain <[email protected]> Signed-off-by: Alex Volchok <[email protected]> * Update test/e2e/tests/eg_upgrade.go Co-authored-by: zirain <[email protected]> Signed-off-by: Alex Volchok <[email protected]> * adding updated go mod Signed-off-by: Alexander Volchok <[email protected]> * fix tests Signed-off-by: Alexander Volchok <[email protected]> * move eg upgrade tests to a dedicated suit Signed-off-by: Alexander Volchok <[email protected]> * removing unused Signed-off-by: Alexander Volchok <[email protected]> * fix code review feedbacks and move e2e clean after the eg upgrades suit Signed-off-by: Alexander Volchok <[email protected]> * don't clean after this step yet Signed-off-by: Alexander Volchok <[email protected]> * increase helm install / upgrade default timeouts Signed-off-by: Alexander Volchok <[email protected]> * restructure test order add an option to execute a single test Signed-off-by: Alexander Volchok <[email protected]> * fix kube make single test exec Signed-off-by: Alexander Volchok <[email protected]> * change to rc version Signed-off-by: Alexander Volchok <[email protected]> * removing loadtest part, changing to simple requests Signed-off-by: Alexander Volchok <[email protected]> --------- Signed-off-by: Alexander Volchok <[email protected]> Signed-off-by: Alex Volchok <[email protected]> Co-authored-by: zirain <[email protected]> * Docs for ext auth (#2868) * docs for ext auth Signed-off-by: huabing zhao <[email protected]> * fix lint Signed-off-by: huabing zhao <[email protected]> --------- Signed-off-by: huabing zhao <[email protected]> * Remove the uncessary \ (#2883) remove the \ Signed-off-by: huabing zhao <[email protected]> * docs: backend tls policy (#2884) * backend tls docs Signed-off-by: Guy Daich <[email protected]> * fix somy copy-paste mistakes Signed-off-by: Guy Daich <[email protected]> * fix typo Signed-off-by: Guy Daich <[email protected]> --------- Signed-off-by: Guy Daich <[email protected]> * feat: add PolicyStatus for BackendTrafficPolicy (#2846) * add PolicyStatus for BTP Signed-off-by: shawnh2 <[email protected]> * fix gen-check Signed-off-by: shawnh2 <[email protected]> * fix ns problem, add more test and modify controller behavior Signed-off-by: shawnh2 <[email protected]> * fix lint Signed-off-by: shawnh2 <[email protected]> * make gateway as the ancestor of btp if it is targeting to the gateway Signed-off-by: shawnh2 <[email protected]> * fix linter Signed-off-by: shawnh2 <[email protected]> * fix go.mod Signed-off-by: shawnh2 <[email protected]> * do some polish Signed-off-by: shawnh2 <[email protected]> --------- Signed-off-by: shawnh2 <[email protected]> * Change the Merge behavior to Replace for SecurityPolicy (#2885) * Change the Merge behavior to Replace for SecurityPolicy Signed-off-by: huabing zhao <[email protected]> * add another http route Signed-off-by: huabing zhao <[email protected]> --------- Signed-off-by: huabing zhao <[email protected]> * e2e: add weighted backend (#2863) * e2e: add backend weighted Signed-off-by: ShyunnY <[email protected]> * fix: Fix weight calculation issue and use AlmostEqual func Signed-off-by: ShyunnY <[email protected]> * fix: add additional comments Signed-off-by: ShyunnY <[email protected]> --------- Signed-off-by: ShyunnY <[email protected]> Co-authored-by: Xunzhuo <[email protected]> * http3: use service port in alt-svc header (#2886) Fixes: #2882 Signed-off-by: Arko Dasgupta <[email protected]> * bug: add h3 alpn by default if http3 is enabled (#2887) Fixes: #2875 Signed-off-by: Arko Dasgupta <[email protected]> * fix: prevent policies targeting non-TLS listeners on the same port from conflicting (#2786) * * Validate that multiple policies that affect listener configuration don't map to the same listener filter chain. * Change the XDS listener generation so that instead of defaultFilterChain for non-TLS routes, a filterChain with a destinationPort matcher is used. This allows multiple policies attached to non-TLS listeners that differ on the destination port to provide different policies without conflicting. Signed-off-by: Lior Okman <[email protected]> * Make hostname based routing work again for non-TLS listeners Signed-off-by: Lior Okman <[email protected]> * Fixed testdata for egctl Signed-off-by: Lior Okman <[email protected]> * Make the linter happy Signed-off-by: Lior Okman <[email protected]> * Added a unit-test Signed-off-by: Lior Okman <[email protected]> * Make the linter happy Signed-off-by: Lior Okman <[email protected]> * Update an e2e test with the new filterChain patch Signed-off-by: Lior Okman <[email protected]> * Revert changing the XDS translation, since a new listener is created anyways for each port. Signed-off-by: Lior Okman <[email protected]> * Also revert the xds change in the e2e test. Signed-off-by: Lior Okman <[email protected]> * Don't need to go over the full XDSIR map - just the current gateway. Signed-off-by: Lior Okman <[email protected]> * Refactored to separate the validation and the translation. Renamed the helper method to a more generic name. Signed-off-by: Lior Okman <[email protected]> --------- Signed-off-by: Lior Okman <[email protected]> Co-authored-by: Guy Daich <[email protected]> * chore: remove ProcessBackendTLSPoliciesAncestorRef (#2845) * remove ProcessBackendTLSPoliciesAncestorRef Signed-off-by: huabing zhao <[email protected]> * address comments Signed-off-by: huabing zhao <[email protected]> --------- Signed-off-by: huabing zhao <[email protected]> * Change the Merge behavior to Replace for BackendTrafficPolicy (#2888) * Change the Merge behavior to Replace for BackendTrafficPolicy Signed-off-by: huabing zhao <[email protected]> * address comments Signed-off-by: huabing zhao <[email protected]> --------- Signed-off-by: huabing zhao <[email protected]> * shutdown drainTimeout should also affect envoy drain time (#2898) Signed-off-by: Arko Dasgupta <[email protected]> * skip publishing empty status for policies (#2902) * skip publishing empty status for policies * #2802 skips computing status if a target resource cannot be found, mainly because that target maybe irrelevant to this specific translation, its hard to proactively find that out in the provider layer * This fix ensures that any empty status is not published and resets any existing status for a policy Signed-off-by: Arko Dasgupta <[email protected]> * also fix for envoypatchpolicy Signed-off-by: Arko Dasgupta <[email protected]> * also discard status for backendtlspolicy Signed-off-by: Arko Dasgupta <[email protected]> --------- Signed-off-by: Arko Dasgupta <[email protected]> * docs: multiple gatewayclass and merge gateways deployment mode (#2881) * docs: multiple gatewayclass and merge gateways deployment mode Signed-off-by: Karol Szwaj <[email protected]> * add merged-gateways example Signed-off-by: Karol Szwaj <[email protected]> * md lint Signed-off-by: Karol Szwaj <[email protected]> * yaml lint Signed-off-by: Karol Szwaj <[email protected]> * add user guides Signed-off-by: Karol Szwaj <[email protected]> --------- Signed-off-by: Karol Szwaj <[email protected]> Co-authored-by: Xunzhuo <[email protected]> * feat: add PolicyStatus for ClientTrafficPolicy (#2895) * add PolicyStatus for CTP Signed-off-by: shawnh2 <[email protected]> * fix gen-check Signed-off-by: shawnh2 <[email protected]> * revert discard policy status Signed-off-by: shawnh2 <[email protected]> --------- Signed-off-by: shawnh2 <[email protected]> * Use gwapiv1a2.PolicyStatus for SecurityPolicy Status (#2848) * use gwapiv1a2.PolicyStatus for SecurityPolicy Status Signed-off-by: huabing zhao <[email protected]> * fix lint Signed-off-by: huabing zhao <[email protected]> * add test for cross-ns refs Signed-off-by: huabing zhao <[email protected]> * add todo Signed-off-by: huabing zhao <[email protected]> * Update internal/gatewayapi/securitypolicy.go Co-authored-by: sh2 <[email protected]> Signed-off-by: Huabing Zhao <[email protected]> * address comments Signed-off-by: huabing zhao <[email protected]> --------- Signed-off-by: huabing zhao <[email protected]> Signed-off-by: Huabing Zhao <[email protected]> Co-authored-by: sh2 <[email protected]> * Fix oidc doc (#2905) fix oidc doc Signed-off-by: huabing zhao <[email protected]> * Release v1.0 (#2909) * add v1.0.0 release note Signed-off-by: bitliu <[email protected]> * generate v1.0 release page Signed-off-by: bitliu <[email protected]> * add v1.0.0 release announcement Signed-off-by: bitliu <[email protected]> * generate v1.0.0 docs Signed-off-by: bitliu <[email protected]> * update site links Signed-off-by: bitliu <[email protected]> * fix linter Signed-off-by: bitliu <[email protected]> --------- Signed-off-by: bitliu <[email protected]> --------- Signed-off-by: bitliu <[email protected]> Signed-off-by: yeedove <[email protected]> Signed-off-by: Yuneui Jeong <[email protected]> Signed-off-by: Yuneui <[email protected]> Signed-off-by: Arko Dasgupta <[email protected]> Signed-off-by: Lior Okman <[email protected]> Signed-off-by: Dennis Zhou <[email protected]> Signed-off-by: phantooom <[email protected]> Signed-off-by: zou rui <[email protected]> Signed-off-by: zirain <[email protected]> Signed-off-by: huabing zhao <[email protected]> Signed-off-by: shawnh2 <[email protected]> Signed-off-by: Ardika Bagus <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Huabing Zhao <[email protected]> Signed-off-by: David Alger <[email protected]> Signed-off-by: Guy Daich <[email protected]> Signed-off-by: Alexander Volchok <[email protected]> Signed-off-by: Alex Volchok <[email protected]> Signed-off-by: ShyunnY <[email protected]> Signed-off-by: Karol Szwaj <[email protected]> Co-authored-by: Guy Daich <[email protected]> Co-authored-by: Dennis Zhou <[email protected]> Co-authored-by: Yuneui Jeong <[email protected]> Co-authored-by: Arko Dasgupta <[email protected]> Co-authored-by: Lior Okman <[email protected]> Co-authored-by: Dennis Zhou <[email protected]> Co-authored-by: zou rui <[email protected]> Co-authored-by: Huabing Zhao <[email protected]> Co-authored-by: zirain <[email protected]> Co-authored-by: sh2 <[email protected]> Co-authored-by: Ardika <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: David Alger <[email protected]> Co-authored-by: Alex Volchok <[email protected]> Co-authored-by: Shyunn <[email protected]> Co-authored-by: Karol Szwaj <[email protected]>

liorokman requested a review from a team as a code owner March 5, 2024 12:58

liorokman marked this pull request as draft March 5, 2024 12:59

liorokman marked this pull request as ready for review March 5, 2024 15:49

arkodg changed the title ~~fix: prevent policies targeting non-TLS listeners from conflicting~~ fix: prevent policies targeting non-TLS listeners on the same port from conflicting Mar 5, 2024

arkodg added this to the Backlog milestone Mar 5, 2024

guydc reviewed Mar 6, 2024

View reviewed changes

arkodg reviewed Mar 12, 2024

View reviewed changes

arkodg previously approved these changes Mar 12, 2024

View reviewed changes

arkodg requested review from a team March 12, 2024 04:53

liorokman added 8 commits March 12, 2024 07:30

Make hostname based routing work again for non-TLS listeners

1fd8409

Signed-off-by: Lior Okman <[email protected]>

Fixed testdata for egctl

a142bdb

Signed-off-by: Lior Okman <[email protected]>

Make the linter happy

c655ce9

Signed-off-by: Lior Okman <[email protected]>

Added a unit-test

48a996c

Signed-off-by: Lior Okman <[email protected]>

Make the linter happy

c53ac4d

Signed-off-by: Lior Okman <[email protected]>

Update an e2e test with the new filterChain patch

4387b60

Signed-off-by: Lior Okman <[email protected]>

Revert changing the XDS translation, since a new listener is created

818cb1b

anyways for each port. Signed-off-by: Lior Okman <[email protected]>

liorokman added 3 commits March 12, 2024 07:30

Also revert the xds change in the e2e test.

e29be66

Signed-off-by: Lior Okman <[email protected]>

Don't need to go over the full XDSIR map - just the current gateway.

78ea43a

Signed-off-by: Lior Okman <[email protected]>

Refactored to separate the validation and the translation.

7861c70

Renamed the helper method to a more generic name. Signed-off-by: Lior Okman <[email protected]>

liorokman dismissed arkodg’s stale review via 7861c70 March 12, 2024 05:49

liorokman force-pushed the reject-policies-with-mergegateways branch from 0588873 to 7861c70 Compare March 12, 2024 05:49

Merge branch 'main' into reject-policies-with-mergegateways

36aefe5

guydc approved these changes Mar 12, 2024

View reviewed changes

arkodg approved these changes Mar 12, 2024

View reviewed changes

arkodg merged commit 8d05fb5 into envoyproxy:main Mar 12, 2024

arkodg mentioned this pull request Mar 18, 2024

bug: Allow Policy to attach to multiple http listeners #2963

Closed

modatwork mentioned this pull request Jul 23, 2024

Prevent ExtensionServerPolicies targeting non-TLS listeners on the same port from conflicting #3942

Open

Conversation

liorokman commented Mar 5, 2024

Uh oh!

codecov bot commented Mar 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

arkodg commented Mar 5, 2024

Uh oh!

guydc Mar 6, 2024

Choose a reason for hiding this comment

Uh oh!

liorokman Mar 6, 2024

Choose a reason for hiding this comment

Uh oh!

arkodg commented Mar 6, 2024

Uh oh!

liorokman commented Mar 7, 2024

Uh oh!

liorokman commented Mar 7, 2024

Uh oh!

arkodg commented Mar 7, 2024

Uh oh!

liorokman commented Mar 8, 2024

Uh oh!

liorokman commented Mar 8, 2024

Uh oh!

arkodg commented Mar 9, 2024

Uh oh!

liorokman commented Mar 9, 2024

Uh oh!

arkodg commented Mar 9, 2024

Uh oh!

liorokman commented Mar 11, 2024

Uh oh!

arkodg Mar 12, 2024

Choose a reason for hiding this comment

Uh oh!

liorokman Mar 12, 2024

Choose a reason for hiding this comment

Uh oh!

arkodg left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov bot commented Mar 5, 2024 •

edited

Loading