From 21c455cf2000670b34cc466ba7bfb05e76d754a4 Mon Sep 17 00:00:00 2001
From: Romain <rtribotte@users.noreply.github.com>
Date: Tue, 28 Feb 2023 17:06:05 +0100
Subject: [PATCH] Remove User-Agent header removal from ReverseProxy director
 func

---
 pkg/server/service/proxy.go        |  4 ---
 pkg/server/service/service_test.go | 58 +++++++++++++++++++++++++++---
 2 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/pkg/server/service/proxy.go b/pkg/server/service/proxy.go
index 12ce95ce7..2669499bf 100644
--- a/pkg/server/service/proxy.go
+++ b/pkg/server/service/proxy.go
@@ -55,10 +55,6 @@ func buildProxy(passHostHeader *bool, responseForwarding *dynamic.ResponseForwar
 			outReq.ProtoMajor = 1
 			outReq.ProtoMinor = 1
 
-			if _, ok := outReq.Header["User-Agent"]; !ok {
-				outReq.Header.Set("User-Agent", "")
-			}
-
 			// Do not pass client Host header unless optsetter PassHostHeader is set.
 			if passHostHeader != nil && !*passHostHeader {
 				outReq.Host = outReq.URL.Host
diff --git a/pkg/server/service/service_test.go b/pkg/server/service/service_test.go
index 4d7ef7268..961f47091 100644
--- a/pkg/server/service/service_test.go
+++ b/pkg/server/service/service_test.go
@@ -89,24 +89,34 @@ func TestGetLoadBalancerServiceHandler(t *testing.T) {
 	server1 := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("X-From", "first")
 	}))
-	defer server1.Close()
+	t.Cleanup(server1.Close)
 
 	server2 := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("X-From", "second")
 	}))
-	defer server2.Close()
+	t.Cleanup(server2.Close)
 
 	serverPassHost := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("X-From", "passhost")
 		assert.Equal(t, "callme", r.Host)
 	}))
-	defer serverPassHost.Close()
+	t.Cleanup(serverPassHost.Close)
 
 	serverPassHostFalse := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("X-From", "passhostfalse")
 		assert.NotEqual(t, "callme", r.Host)
 	}))
-	defer serverPassHostFalse.Close()
+	t.Cleanup(serverPassHostFalse.Close)
+
+	hasNoUserAgent := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		assert.Empty(t, r.Header.Get("User-Agent"))
+	}))
+	t.Cleanup(hasNoUserAgent.Close)
+
+	hasUserAgent := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		assert.Equal(t, "foobar", r.Header.Get("User-Agent"))
+	}))
+	t.Cleanup(hasUserAgent.Close)
 
 	type ExpectedResult struct {
 		StatusCode     int
@@ -122,6 +132,7 @@ func TestGetLoadBalancerServiceHandler(t *testing.T) {
 		service          *dynamic.ServersLoadBalancer
 		responseModifier func(*http.Response) error
 		cookieRawValue   string
+		userAgent        string
 
 		expected []ExpectedResult
 	}{
@@ -286,6 +297,39 @@ func TestGetLoadBalancerServiceHandler(t *testing.T) {
 				},
 			},
 		},
+		{
+			desc:        "No user-agent",
+			serviceName: "test",
+			service: &dynamic.ServersLoadBalancer{
+				Servers: []dynamic.Server{
+					{
+						URL: hasNoUserAgent.URL,
+					},
+				},
+			},
+			expected: []ExpectedResult{
+				{
+					StatusCode: http.StatusOK,
+				},
+			},
+		},
+		{
+			desc:        "Custom user-agent",
+			serviceName: "test",
+			userAgent:   "foobar",
+			service: &dynamic.ServersLoadBalancer{
+				Servers: []dynamic.Server{
+					{
+						URL: hasUserAgent.URL,
+					},
+				},
+			},
+			expected: []ExpectedResult{
+				{
+					StatusCode: http.StatusOK,
+				},
+			},
+		},
 	}
 
 	for _, test := range testCases {
@@ -297,6 +341,12 @@ func TestGetLoadBalancerServiceHandler(t *testing.T) {
 			assert.NotNil(t, handler)
 
 			req := testhelpers.MustNewRequest(http.MethodGet, "http://callme", nil)
+			assert.Equal(t, "", req.Header.Get("User-Agent"))
+
+			if test.userAgent != "" {
+				req.Header.Set("User-Agent", test.userAgent)
+			}
+
 			if test.cookieRawValue != "" {
 				req.Header.Set("Cookie", test.cookieRawValue)
 			}