Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(kuma-cp) enable forwarding XFCC header #1941

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions pkg/xds/envoy/listeners/configurers.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,15 @@ func ServerSideMTLS(ctx xds_context.Context, metadata *core_xds.DataplaneMetadat
})
}

func HttpConnectionManager(statsName string) FilterChainBuilderOpt {
func HttpConnectionManager(statsName string, forwardClientCertDetails bool) FilterChainBuilderOpt {
return FilterChainBuilderOptFunc(func(config *FilterChainBuilderConfig) {
config.AddV2(&v2.HttpConnectionManagerConfigurer{
StatsName: statsName,
StatsName: statsName,
ForwardClientCertDetails: forwardClientCertDetails,
})
config.AddV3(&v3.HttpConnectionManagerConfigurer{
StatsName: statsName,
StatsName: statsName,
ForwardClientCertDetails: forwardClientCertDetails,
})
})
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var _ = Describe("FaultInjectionConfigurer", func() {
func(given testCase) {
// when
filterChain, err := NewFilterChainBuilder(envoy.APIV2).
Configure(HttpConnectionManager("stats")).
Configure(HttpConnectionManager("stats", false)).
Configure(FaultInjection(given.input)).
Build()
// then
Expand Down
2 changes: 1 addition & 1 deletion pkg/xds/envoy/listeners/v2/grpc_stats_configurer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var _ = Describe("gRPCStatsConfigurer", func() {
func(given testCase) {
// when
filterChain, err := NewFilterChainBuilder(envoy.APIV2).
Configure(HttpConnectionManager("stats")).
Configure(HttpConnectionManager("stats", false)).
Configure(GrpcStats()).
Build()
// then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ var _ = Describe("HttpAccessLogConfigurer", func() {
listener, err := NewListenerBuilder(envoy.APIV2).
Configure(OutboundListener(given.listenerName, given.listenerAddress, given.listenerPort, given.listenerProtocol)).
Configure(FilterChain(NewFilterChainBuilder(envoy.APIV2).
Configure(HttpConnectionManager(given.statsName)).
Configure(HttpConnectionManager(given.statsName, false)).
Configure(HttpAccessLog(mesh, envoy.TrafficDirectionOutbound, sourceService, destinationService, given.backend, proxy)))).
Build()
// then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import (
)

type HttpConnectionManagerConfigurer struct {
StatsName string
StatsName string
ForwardClientCertDetails bool
}

func (c *HttpConnectionManagerConfigurer) Configure(filterChain *envoy_listener.FilterChain) error {
Expand All @@ -22,6 +23,13 @@ func (c *HttpConnectionManagerConfigurer) Configure(filterChain *envoy_listener.
// notice that route configuration is left up to other configurers
}

if c.ForwardClientCertDetails {
config.ForwardClientCertDetails = envoy_hcm.HttpConnectionManager_SANITIZE_SET
config.SetCurrentClientCertDetails = &envoy_hcm.HttpConnectionManager_SetCurrentClientCertDetails{
Uri: true,
}
}

pbst, err := util_proto.MarshalAnyDeterministic(config)
if err != nil {
return err
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var _ = Describe("HttpConnectionManagerConfigurer", func() {
listener, err := NewListenerBuilder(envoy.APIV2).
Configure(InboundListener(given.listenerName, given.listenerAddress, given.listenerPort, given.listenerProtocol)).
Configure(FilterChain(NewFilterChainBuilder(envoy.APIV2).
Configure(HttpConnectionManager(given.statsName)))).
Configure(HttpConnectionManager(given.statsName, true)))).
Build()
// then
Expect(err).ToNot(HaveOccurred())
Expand Down Expand Up @@ -58,6 +58,9 @@ var _ = Describe("HttpConnectionManagerConfigurer", func() {
- name: envoy.filters.network.http_connection_manager
typedConfig:
'@type': type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
forwardClientCertDetails: SANITIZE_SET
setCurrentClientCertDetails:
uri: true
statPrefix: localhost_8080
httpFilters:
- name: envoy.filters.http.router
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ var _ = Describe("HttpInboundRouteConfigurer", func() {
listener, err := NewListenerBuilder(envoy_common.APIV2).
Configure(InboundListener(given.listenerName, given.listenerAddress, given.listenerPort, given.listenerProtocol)).
Configure(FilterChain(NewFilterChainBuilder(envoy_common.APIV2).
Configure(HttpConnectionManager(given.statsName)).
Configure(HttpConnectionManager(given.statsName, true)).
Configure(HttpInboundRoute(given.service, given.cluster)))).
Build()
// then
Expand Down Expand Up @@ -63,6 +63,9 @@ var _ = Describe("HttpInboundRouteConfigurer", func() {
- name: envoy.filters.network.http_connection_manager
typedConfig:
'@type': type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
forwardClientCertDetails: SANITIZE_SET
setCurrentClientCertDetails:
uri: true
httpFilters:
- name: envoy.filters.http.router
routeConfig:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var _ = Describe("HttpOutboundRouteConfigurer", func() {
listener, err := NewListenerBuilder(envoy_common.APIV2).
Configure(OutboundListener(given.listenerName, given.listenerAddress, given.listenerPort, given.listenerProtocol)).
Configure(FilterChain(NewFilterChainBuilder(envoy_common.APIV2).
Configure(HttpConnectionManager(given.statsName)).
Configure(HttpConnectionManager(given.statsName, false)).
Configure(HttpOutboundRoute(given.service, given.subsets, given.dpTags)))).
Build()
// then
Expand Down
2 changes: 1 addition & 1 deletion pkg/xds/envoy/listeners/v2/retry_configurer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ var _ = Describe("RetryConfigurer", func() {
listener, err := NewListenerBuilder(envoy_common.APIV2).
Configure(OutboundListener(given.listenerName, given.listenerAddress, given.listenerPort, given.listenerProtocol)).
Configure(FilterChain(NewFilterChainBuilder(envoy_common.APIV2).
Configure(HttpConnectionManager(given.statsName)).
Configure(HttpConnectionManager(given.statsName, false)).
Configure(HttpOutboundRoute(
given.service,
given.subsets,
Expand Down
2 changes: 1 addition & 1 deletion pkg/xds/envoy/listeners/v2/tracing_configurer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var _ = Describe("TracingConfigurer", func() {
listener, err := NewListenerBuilder(envoy.APIV2).
Configure(InboundListener("inbound:192.168.0.1:8080", "192.168.0.1", 8080, xds.SocketAddressProtocolTCP)).
Configure(FilterChain(NewFilterChainBuilder(envoy.APIV2).
Configure(HttpConnectionManager("localhost:8080")).
Configure(HttpConnectionManager("localhost:8080", false)).
Configure(Tracing(given.backend)))).
Build()
// then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var _ = Describe("FaultInjectionConfigurer", func() {
func(given testCase) {
// when
filterChain, err := NewFilterChainBuilder(envoy.APIV3).
Configure(HttpConnectionManager("stats")).
Configure(HttpConnectionManager("stats", false)).
Configure(FaultInjection(given.input)).
Build()
// then
Expand Down
2 changes: 1 addition & 1 deletion pkg/xds/envoy/listeners/v3/grpc_stats_configurer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var _ = Describe("gRPCStatsConfigurer", func() {
func(given testCase) {
// when
filterChain, err := NewFilterChainBuilder(envoy.APIV3).
Configure(HttpConnectionManager("stats")).
Configure(HttpConnectionManager("stats", false)).
Configure(GrpcStats()).
Build()
// then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ var _ = Describe("HttpAccessLogConfigurer", func() {
listener, err := NewListenerBuilder(envoy.APIV3).
Configure(OutboundListener(given.listenerName, given.listenerAddress, given.listenerPort, given.listenerProtocol)).
Configure(FilterChain(NewFilterChainBuilder(envoy.APIV3).
Configure(HttpConnectionManager(given.statsName)).
Configure(HttpConnectionManager(given.statsName, false)).
Configure(HttpAccessLog(mesh, envoy.TrafficDirectionOutbound, sourceService, destinationService, given.backend, proxy)))).
Build()
// then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import (
)

type HttpConnectionManagerConfigurer struct {
StatsName string
StatsName string
ForwardClientCertDetails bool
}

func (c *HttpConnectionManagerConfigurer) Configure(filterChain *envoy_listener.FilterChain) error {
Expand All @@ -22,6 +23,13 @@ func (c *HttpConnectionManagerConfigurer) Configure(filterChain *envoy_listener.
// notice that route configuration is left up to other configurers
}

if c.ForwardClientCertDetails {
config.ForwardClientCertDetails = envoy_hcm.HttpConnectionManager_SANITIZE_SET
config.SetCurrentClientCertDetails = &envoy_hcm.HttpConnectionManager_SetCurrentClientCertDetails{
Uri: true,
}
}

pbst, err := util_proto.MarshalAnyDeterministic(config)
if err != nil {
return err
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var _ = Describe("HttpConnectionManagerConfigurer", func() {
listener, err := NewListenerBuilder(envoy.APIV3).
Configure(InboundListener(given.listenerName, given.listenerAddress, given.listenerPort, given.listenerProtocol)).
Configure(FilterChain(NewFilterChainBuilder(envoy.APIV3).
Configure(HttpConnectionManager(given.statsName)))).
Configure(HttpConnectionManager(given.statsName, true)))).
Build()
// then
Expect(err).ToNot(HaveOccurred())
Expand Down Expand Up @@ -58,6 +58,9 @@ var _ = Describe("HttpConnectionManagerConfigurer", func() {
- name: envoy.filters.network.http_connection_manager
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
forwardClientCertDetails: SANITIZE_SET
setCurrentClientCertDetails:
uri: true
statPrefix: localhost_8080
httpFilters:
- name: envoy.filters.http.router
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ var _ = Describe("HttpInboundRouteConfigurer", func() {
listener, err := NewListenerBuilder(envoy_common.APIV3).
Configure(InboundListener(given.listenerName, given.listenerAddress, given.listenerPort, given.listenerProtocol)).
Configure(FilterChain(NewFilterChainBuilder(envoy_common.APIV3).
Configure(HttpConnectionManager(given.statsName)).
Configure(HttpConnectionManager(given.statsName, true)).
Configure(HttpInboundRoute(given.service, given.cluster)))).
Build()
// then
Expand Down Expand Up @@ -63,6 +63,9 @@ var _ = Describe("HttpInboundRouteConfigurer", func() {
- name: envoy.filters.network.http_connection_manager
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
forwardClientCertDetails: SANITIZE_SET
setCurrentClientCertDetails:
uri: true
httpFilters:
- name: envoy.filters.http.router
routeConfig:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var _ = Describe("HttpOutboundRouteConfigurer", func() {
listener, err := NewListenerBuilder(envoy_common.APIV3).
Configure(OutboundListener(given.listenerName, given.listenerAddress, given.listenerPort, given.listenerProtocol)).
Configure(FilterChain(NewFilterChainBuilder(envoy_common.APIV3).
Configure(HttpConnectionManager(given.statsName)).
Configure(HttpConnectionManager(given.statsName, false)).
Configure(HttpOutboundRoute(given.service, given.subsets, given.dpTags)))).
Build()
// then
Expand Down
2 changes: 1 addition & 1 deletion pkg/xds/envoy/listeners/v3/retry_configurer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ var _ = Describe("RetryConfigurer", func() {
listener, err := NewListenerBuilder(envoy_common.APIV3).
Configure(OutboundListener(given.listenerName, given.listenerAddress, given.listenerPort, given.listenerProtocol)).
Configure(FilterChain(NewFilterChainBuilder(envoy_common.APIV3).
Configure(HttpConnectionManager(given.statsName)).
Configure(HttpConnectionManager(given.statsName, false)).
Configure(HttpOutboundRoute(
given.service,
given.subsets,
Expand Down
2 changes: 1 addition & 1 deletion pkg/xds/envoy/listeners/v3/tracing_configurer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var _ = Describe("TracingConfigurer", func() {
listener, err := NewListenerBuilder(envoy.APIV3).
Configure(InboundListener("inbound:192.168.0.1:8080", "192.168.0.1", 8080, xds.SocketAddressProtocolTCP)).
Configure(FilterChain(NewFilterChainBuilder(envoy.APIV3).
Configure(HttpConnectionManager("localhost:8080")).
Configure(HttpConnectionManager("localhost:8080", false)).
Configure(Tracing(given.backend)))).
Build()
// then
Expand Down
4 changes: 2 additions & 2 deletions pkg/xds/generator/inbound_proxy_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ func (g InboundProxyGenerator) Generate(ctx xds_context.Context, proxy *model.Pr
// configuration for HTTP case
case mesh_core.ProtocolHTTP, mesh_core.ProtocolHTTP2:
filterChainBuilder.
Configure(envoy_listeners.HttpConnectionManager(localClusterName)).
Configure(envoy_listeners.HttpConnectionManager(localClusterName, true)).
Configure(envoy_listeners.FaultInjection(proxy.Policies.FaultInjections[endpoint])).
Configure(envoy_listeners.Tracing(proxy.Policies.TracingBackend)).
Configure(envoy_listeners.HttpInboundRoute(service, envoy_common.ClusterSubset{ClusterName: localClusterName}))
case mesh_core.ProtocolGRPC:
filterChainBuilder.
Configure(envoy_listeners.HttpConnectionManager(localClusterName)).
Configure(envoy_listeners.HttpConnectionManager(localClusterName, true)).
Configure(envoy_listeners.GrpcStats()).
Configure(envoy_listeners.FaultInjection(proxy.Policies.FaultInjections[endpoint])).
Configure(envoy_listeners.Tracing(proxy.Policies.TracingBackend)).
Expand Down
4 changes: 2 additions & 2 deletions pkg/xds/generator/outbound_proxy_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,15 @@ func (_ OutboundProxyGenerator) generateLDS(proxy *model.Proxy, subsets []envoy_
switch protocol {
case mesh_core.ProtocolGRPC:
filterChainBuilder.
Configure(envoy_listeners.HttpConnectionManager(serviceName)).
Configure(envoy_listeners.HttpConnectionManager(serviceName, false)).
Configure(envoy_listeners.Tracing(proxy.Policies.TracingBackend)).
Configure(envoy_listeners.HttpAccessLog(meshName, envoy_common.TrafficDirectionOutbound, sourceService, serviceName, proxy.Policies.Logs[serviceName], proxy)).
Configure(envoy_listeners.HttpOutboundRoute(serviceName, subsets, proxy.Dataplane.Spec.TagSet())).
Configure(envoy_listeners.Retry(retryPolicy, protocol)).
Configure(envoy_listeners.GrpcStats())
case mesh_core.ProtocolHTTP, mesh_core.ProtocolHTTP2:
filterChainBuilder.
Configure(envoy_listeners.HttpConnectionManager(serviceName)).
Configure(envoy_listeners.HttpConnectionManager(serviceName, false)).
Configure(envoy_listeners.Tracing(proxy.Policies.TracingBackend)).
Configure(envoy_listeners.HttpAccessLog(
meshName,
Expand Down
2 changes: 1 addition & 1 deletion pkg/xds/generator/probe_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func (g ProbeProxyGenerator) Generate(ctx xds_context.Context, proxy *model.Prox
probeListener, err := envoy_listeners.NewListenerBuilder(proxy.APIVersion).
Configure(envoy_listeners.InboundListener(listenerName, proxy.Dataplane.Spec.GetNetworking().GetAddress(), probes.Port, model.SocketAddressProtocolTCP)).
Configure(envoy_listeners.FilterChain(envoy_listeners.NewFilterChainBuilder(proxy.APIVersion).
Configure(envoy_listeners.HttpConnectionManager(listenerName)).
Configure(envoy_listeners.HttpConnectionManager(listenerName, false)).
Configure(envoy_listeners.HttpStaticRoute(envoy_routes.NewRouteConfigurationBuilder(proxy.APIVersion).
Configure(envoy_routes.VirtualHost(virtualHostBuilder)))))).
Configure(envoy_listeners.TransparentProxying(proxy.Dataplane.Spec.Networking.GetTransparentProxying())).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ resources:
- name: envoy.filters.network.http_connection_manager
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
forwardClientCertDetails: SANITIZE_SET
httpFilters:
- name: envoy.filters.http.fault
typedConfig:
Expand Down Expand Up @@ -141,6 +142,8 @@ resources:
route:
cluster: localhost:8080
timeout: 0s
setCurrentClientCertDetails:
uri: true
statPrefix: localhost_8080
transportSocket:
name: envoy.transport_sockets.tls
Expand Down Expand Up @@ -242,6 +245,7 @@ resources:
- name: envoy.filters.network.http_connection_manager
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
forwardClientCertDetails: SANITIZE_SET
httpFilters:
- name: envoy.filters.http.router
routeConfig:
Expand All @@ -259,6 +263,8 @@ resources:
route:
cluster: localhost:8080
timeout: 0s
setCurrentClientCertDetails:
uri: true
statPrefix: localhost_8080
transportSocket:
name: envoy.transport_sockets.tls
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ resources:
- name: envoy.filters.network.http_connection_manager
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
forwardClientCertDetails: SANITIZE_SET
httpFilters:
- name: envoy.filters.http.fault
typedConfig:
Expand Down Expand Up @@ -143,6 +144,8 @@ resources:
route:
cluster: localhost:8080
timeout: 0s
setCurrentClientCertDetails:
uri: true
statPrefix: localhost_8080
transportSocket:
name: envoy.transport_sockets.tls
Expand Down Expand Up @@ -246,6 +249,7 @@ resources:
- name: envoy.filters.network.http_connection_manager
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
forwardClientCertDetails: SANITIZE_SET
httpFilters:
- name: envoy.filters.http.router
routeConfig:
Expand All @@ -263,6 +267,8 @@ resources:
route:
cluster: localhost:8080
timeout: 0s
setCurrentClientCertDetails:
uri: true
statPrefix: localhost_8080
transportSocket:
name: envoy.transport_sockets.tls
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ resources:
- name: envoy.filters.network.http_connection_manager
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
forwardClientCertDetails: SANITIZE_SET
httpFilters:
- name: envoy.filters.http.router
routeConfig:
Expand All @@ -183,6 +184,8 @@ resources:
route:
cluster: localhost:8080
timeout: 0s
setCurrentClientCertDetails:
uri: true
statPrefix: localhost_8080
transportSocket:
name: envoy.transport_sockets.tls
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ resources:
- name: envoy.filters.network.http_connection_manager
typedConfig:
'@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
forwardClientCertDetails: SANITIZE_SET
httpFilters:
- name: envoy.filters.http.router
routeConfig:
Expand All @@ -204,6 +205,8 @@ resources:
route:
cluster: localhost:8080
timeout: 0s
setCurrentClientCertDetails:
uri: true
statPrefix: localhost_8080
transportSocket:
name: envoy.transport_sockets.tls
Expand Down