3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-06 10:21:05 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix codec type

Browse source
This commit is contained in:
Caleb Doxsey 2024-11-18 12:05:23 -07:00
parent 6c63369297
commit d923f2dab0
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
config/envoyconfig/listeners_main.go
View file

@ -43,7 +43,7 @@ func (b *Builder) buildMainInsecureListener(
li.ListenerFilters = append(li.ListenerFilters, ProxyProtocolFilter()) li.ListenerFilters = append(li.ListenerFilters, ProxyProtocolFilter())
} }
filterChain, err := b.buildMainHTTPConnectionManagerFilterChain(ctx, cfg, fullyStatic, nil) filterChain, err := b.buildMainHTTPConnectionManagerFilterChain(ctx, cfg, fullyStatic, false, nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -78,7 +78,7 @@ func (b *Builder) buildMainQuicListener(
return nil, fmt.Errorf("error building quic socket: %w", err) return nil, fmt.Errorf("error building quic socket: %w", err)
} }
filterChain, err := b.buildMainHTTPConnectionManagerFilterChain(ctx, cfg, fullyStatic, transportSocket) filterChain, err := b.buildMainHTTPConnectionManagerFilterChain(ctx, cfg, fullyStatic, true, transportSocket)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -118,7 +118,8 @@ func (b *Builder) buildMainTLSListener(
return nil, err return nil, err
} }
filterChain, err := b.buildMainHTTPConnectionManagerFilterChain(ctx, cfg, fullyStatic, newDownstreamTLSTransportSocket(tlsContext)) transportSocket := newDownstreamTLSTransportSocket(tlsContext)
filterChain, err := b.buildMainHTTPConnectionManagerFilterChain(ctx, cfg, fullyStatic, false, transportSocket)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -131,9 +132,10 @@ func (b *Builder) buildMainHTTPConnectionManagerFilterChain(
ctx context.Context, ctx context.Context,
cfg *config.Config, cfg *config.Config,
fullyStatic bool, fullyStatic bool,
useQUIC bool,
transportSocket *envoy_config_core_v3.TransportSocket, transportSocket *envoy_config_core_v3.TransportSocket,
) (*envoy_config_listener_v3.FilterChain, error) { ) (*envoy_config_listener_v3.FilterChain, error) {
filter, err := b.buildMainHTTPConnectionManagerFilter(ctx, cfg, fullyStatic) filter, err := b.buildMainHTTPConnectionManagerFilter(ctx, cfg, fullyStatic, useQUIC)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -147,6 +149,7 @@ func (b *Builder) buildMainHTTPConnectionManagerFilter(
ctx context.Context, ctx context.Context,
cfg *config.Config, cfg *config.Config,
fullyStatic bool, fullyStatic bool,
useQUIC bool,
) (*envoy_config_listener_v3.Filter, error) { ) (*envoy_config_listener_v3.Filter, error) {
var grpcClientTimeout *durationpb.Duration var grpcClientTimeout *durationpb.Duration
if cfg.Options.GRPCClientTimeout != 0 { if cfg.Options.GRPCClientTimeout != 0 {
@ -182,7 +185,6 @@ func (b *Builder) buildMainHTTPConnectionManagerFilter(
mgr := &envoy_extensions_filters_network_http_connection_manager.HttpConnectionManager{ mgr := &envoy_extensions_filters_network_http_connection_manager.HttpConnectionManager{
AlwaysSetRequestIdInResponse: true, AlwaysSetRequestIdInResponse: true,
CodecType: cfg.Options.GetCodecType().ToEnvoy(),
StatPrefix: "ingress", StatPrefix: "ingress",
HttpFilters: filters, HttpFilters: filters,
AccessLog: buildAccessLogs(cfg.Options), AccessLog: buildAccessLogs(cfg.Options),
@ -204,6 +206,15 @@ func (b *Builder) buildMainHTTPConnectionManagerFilter(
NormalizePath: wrapperspb.Bool(true), NormalizePath: wrapperspb.Bool(true),
} }
if useQUIC {
mgr.CodecType = envoy_extensions_filters_network_http_connection_manager.HttpConnectionManager_HTTP3
mgr.Http3ProtocolOptions = &envoy_config_core_v3.Http3ProtocolOptions{}
} else if cfg.Options.GetCodecType() == config.CodecTypeHTTP3 {
mgr.CodecType = envoy_extensions_filters_network_http_connection_manager.HttpConnectionManager_AUTO
} else {
mgr.CodecType = cfg.Options.GetCodecType().ToEnvoy()
}
if fullyStatic { if fullyStatic {
routeConfiguration, err := b.buildMainRouteConfiguration(ctx, cfg) routeConfiguration, err := b.buildMainRouteConfiguration(ctx, cfg)
if err != nil { if err != nil {

2
config/envoyconfig/listeners_test.go
View file

@ -102,7 +102,7 @@ func Test_buildMainHTTPConnectionManagerFilter(t *testing.T) {
options.SkipXffAppend = true options.SkipXffAppend = true
options.XffNumTrustedHops = 1 options.XffNumTrustedHops = 1
options.AuthenticateURLString = "https://authenticate.example.com" options.AuthenticateURLString = "https://authenticate.example.com"
filter, err := b.buildMainHTTPConnectionManagerFilter(context.Background(), &config.Config{Options: options}, false) filter, err := b.buildMainHTTPConnectionManagerFilter(context.Background(), &config.Config{Options: options}, false, false)
require.NoError(t, err) require.NoError(t, err)
testutil.AssertProtoJSONEqual(t, testData(t, "main_http_connection_manager_filter.json", nil), filter) testutil.AssertProtoJSONEqual(t, testData(t, "main_http_connection_manager_filter.json", nil), filter)
} }