3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-03 16:59:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix redirect server proxy protocol (#5405)

Browse source
This commit is contained in:
Caleb Doxsey 2024-12-23 05:37:11 -07:00 • committed by GitHub
parent 7d15a5efe1
commit b3d2ef95e7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
internal/autocert/manager.go
View file

@ -17,6 +17,7 @@ import (
"github.com/caddyserver/certmagic"
"github.com/mholt/acmez/v2/acme"
"github.com/pires/go-proxyproto"
"github.com/rs/zerolog"
"github.com/pomerium/pomerium/config"
@ -340,8 +341,22 @@ func (mgr *Manager) updateServer(ctx context.Context, cfg *config.Config) {
}),
}
go func() {
li, err := net.Listen("tcp", cfg.Options.HTTPRedirectAddr)
if err != nil {
log.Ctx(ctx).Error().Err(err).Msg("failed to listen on http redirect addr")
return
}
defer li.Close()
if cfg.Options.UseProxyProtocol {
li = &proxyproto.Listener{
Listener: li,
ReadHeaderTimeout: 10 * time.Second,
}
}
log.Ctx(ctx).Info().Str("addr", hsrv.Addr).Msg("starting http redirect server")
err := hsrv.ListenAndServe()
err = hsrv.Serve(li)
if err != nil {
log.Ctx(ctx).Error().Err(err).Msg("failed to run http redirect server")
}