Merge branch v2.3 into master

pkg/tcp/proxy.go

@@ -13,9 +13,11 @@ import (
 
 // Proxy forwards a TCP request to a TCP service.
 type Proxy struct {
+	address          string
 	target           *net.TCPAddr
 	terminationDelay time.Duration
 	proxyProtocol    *dynamic.ProxyProtocol
+	refreshTarget    bool
 }
 
 // NewProxy creates a new Proxy.
@@ -29,7 +31,19 @@ func NewProxy(address string, terminationDelay time.Duration, proxyProtocol *dyn
 		return nil, fmt.Errorf("unknown proxyProtocol version: %d", proxyProtocol.Version)
 	}
 
-	return &Proxy{target: tcpAddr, terminationDelay: terminationDelay, proxyProtocol: proxyProtocol}, nil
+	// enable the refresh of the target only if the address in an IP
+	refreshTarget := false
+	if host, _, err := net.SplitHostPort(address); err == nil && net.ParseIP(host) == nil {
+		refreshTarget = true
+	}
+
+	return &Proxy{
+		address:          address,
+		target:           tcpAddr,
+		refreshTarget:    refreshTarget,
+		terminationDelay: terminationDelay,
+		proxyProtocol:    proxyProtocol,
+	}, nil
 }
 
 // ServeTCP forwards the connection to a service.
@@ -39,6 +53,15 @@ func (p *Proxy) ServeTCP(conn WriteCloser) {
 	// needed because of e.g. server.trackedConnection
 	defer conn.Close()
 
+	if p.refreshTarget {
+		tcpAddr, err := net.ResolveTCPAddr("tcp", p.address)
+		if err != nil {
+			log.Errorf("Error resolving tcp address: %v", err)
+			return
+		}
+		p.target = tcpAddr
+	}
+
 	connBackend, err := net.DialTCP("tcp", nil, p.target)
 	if err != nil {
 		log.Errorf("Error while connection to backend: %v", err)

pkg/tcp/proxy_test.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"net"
+	"sync"
 	"testing"
 	"time"
 
@@ -169,3 +170,74 @@ func TestProxyProtocol(t *testing.T) {
 		})
 	}
 }
+
+func TestLookupAddress(t *testing.T) {
+	testCases := []struct {
+		desc       string
+		address    string
+		expectSame assert.ComparisonAssertionFunc
+	}{
+		{
+			desc:       "IP doesn't need refresh",
+			address:    "8.8.4.4:53",
+			expectSame: assert.Same,
+		},
+		{
+			desc:       "Hostname needs refresh",
+			address:    "dns.google:53",
+			expectSame: assert.NotSame,
+		},
+	}
+
+	for _, test := range testCases {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			t.Parallel()
+
+			proxy, err := NewProxy(test.address, 10*time.Millisecond, nil)
+			require.NoError(t, err)
+
+			require.NotNil(t, proxy.target)
+
+			proxyListener, err := net.Listen("tcp", ":0")
+			require.NoError(t, err)
+
+			var wg sync.WaitGroup
+			go func(wg *sync.WaitGroup) {
+				for {
+					conn, err := proxyListener.Accept()
+					require.NoError(t, err)
+
+					proxy.ServeTCP(conn.(*net.TCPConn))
+
+					wg.Done()
+				}
+			}(&wg)
+
+			var lastTarget *net.TCPAddr
+
+			for i := 0; i < 3; i++ {
+				wg.Add(1)
+
+				conn, err := net.Dial("tcp", proxyListener.Addr().String())
+				require.NoError(t, err)
+
+				_, err = conn.Write([]byte("ping\n"))
+				require.NoError(t, err)
+
+				err = conn.Close()
+				require.NoError(t, err)
+
+				wg.Wait()
+
+				assert.NotNil(t, proxy.target)
+
+				if lastTarget != nil {
+					test.expectSame(t, lastTarget, proxy.target)
+				}
+
+				lastTarget = proxy.target
+			}
+		})
+	}
+}