From 86c0d6a94c9c534f3b873003f79faacc977112c6 Mon Sep 17 00:00:00 2001 From: Bryan Frimin Date: Mon, 2 Feb 2026 10:53:53 +0100 Subject: [PATCH] Remove code who has been merged Signed-off-by: Bryan Frimin --- pkg/probod/probod.go | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/pkg/probod/probod.go b/pkg/probod/probod.go index 5295a164e..7331c6fd4 100644 --- a/pkg/probod/probod.go +++ b/pkg/probod/probod.go @@ -563,7 +563,7 @@ func (impl *Implm) runApiServer( } if len(impl.cfg.Api.ProxyProtocol.TrustedProxies) > 0 { - policy := rejectProxyHeaderFrom(impl.cfg.Api.ProxyProtocol.TrustedProxies...) + policy := proxyproto.TrustProxyHeaderFrom(impl.cfg.Api.ProxyProtocol.TrustedProxies...) listener = &proxyproto.Listener{ Listener: listener, @@ -861,34 +861,3 @@ func (impl *Implm) runTrustCenterServer( return ctx.Err() } - -func rejectProxyHeaderFrom(trustedIPs ...net.IP) proxyproto.ConnPolicyFunc { - return func(connOpts proxyproto.ConnPolicyOptions) (proxyproto.Policy, error) { - ip, err := ipFromAddr(connOpts.Upstream) - if err != nil { - return proxyproto.REJECT, err - } - - for _, trustedIP := range trustedIPs { - if trustedIP.Equal(ip) { - return proxyproto.USE, nil - } - } - - return proxyproto.REJECT, nil - } -} - -func ipFromAddr(upstream net.Addr) (net.IP, error) { - upstreamString, _, err := net.SplitHostPort(upstream.String()) - if err != nil { - return nil, err - } - - upstreamIP := net.ParseIP(upstreamString) - if nil == upstreamIP { - return nil, fmt.Errorf("proxyproto: invalid IP address") - } - - return upstreamIP, nil -}