De-duplicate base headers if specified by user

Problem: If a user set a header in a header filter that had a default value set by NGF, both values would end up being set.

Solution: If provided by a user, don't set the default header value.

Author: sjberman

internal/mode/static/nginx/config/servers.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"maps"
+	"slices"
 	"strconv"
 	"strings"
 	gotemplate "text/template"
@@ -812,7 +813,15 @@ func generateProxySetHeaders(
 		})
 	}
 
-	return append(proxySetHeaders, baseHeaders...)
+	for _, header := range baseHeaders {
+		if !slices.ContainsFunc(proxySetHeaders, func(h http.Header) bool {
+			return header.Name == h.Name
+		}) {
+			proxySetHeaders = append(proxySetHeaders, header)
+		}
+	}
+
+	return proxySetHeaders
 }
 
 func generateResponseHeaders(filters *dataplane.HTTPFilters) http.ResponseHeaders {

internal/mode/static/nginx/config/servers_test.go

@@ -3146,6 +3146,54 @@ func TestGenerateProxySetHeaders(t *testing.T) {
 			}, httpBaseHeaders...),
 			baseHeaders: httpBaseHeaders,
 		},
+		{
+			msg: "header filter overwrite base header",
+			filters: &dataplane.HTTPFilters{
+				RequestHeaderModifiers: &dataplane.HTTPHeaderFilter{
+					Set: []dataplane.HTTPHeader{
+						{
+							Name:  "X-Forwarded-Proto",
+							Value: "new-proto",
+						},
+					},
+				},
+			},
+			expectedHeaders: []http.Header{
+				{
+					Name:  "X-Forwarded-Proto",
+					Value: "new-proto",
+				},
+				{
+					Name:  "Host",
+					Value: "$gw_api_compliant_host",
+				},
+				{
+					Name:  "X-Forwarded-For",
+					Value: "$proxy_add_x_forwarded_for",
+				},
+				{
+					Name:  "X-Real-IP",
+					Value: "$remote_addr",
+				},
+				{
+					Name:  "X-Forwarded-Host",
+					Value: "$host",
+				},
+				{
+					Name:  "X-Forwarded-Port",
+					Value: "$server_port",
+				},
+				{
+					Name:  "Upgrade",
+					Value: "$http_upgrade",
+				},
+				{
+					Name:  "Connection",
+					Value: "$connection_upgrade",
+				},
+			},
+			baseHeaders: httpBaseHeaders,
+		},
 		{
 			msg: "with url rewrite hostname",
 			filters: &dataplane.HTTPFilters{