remove redirect filter header modification

nginx · Sep 6, 2024 · b1cdb27 · b1cdb27
1 parent 8f35ab7
commit b1cdb27
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 74 deletions.
diff --git a/charts/nginx-gateway-fabric/values.yaml b/charts/nginx-gateway-fabric/values.yaml
@@ -103,7 +103,7 @@ nginx:
     #       type: "cidr",
     #     }
     #   ]
-    #    setIPRecursively: true
+    #   setIPRecursively: true
     # telemetry:
     #   exporter:
     #     endpoint: otel-collector.default.svc:4317

diff --git a/internal/mode/static/nginx/config/servers.go b/internal/mode/static/nginx/config/servers.go
@@ -800,7 +800,14 @@ func generateProxySetHeaders(filters *dataplane.HTTPFilters, grpc bool) []http.H
 		copy(headers, grpcBaseHeaders)
 	}
 
-	setHeaderForHTTPSRedirect(filters, headers)
+	if filters != nil && filters.RequestURLRewrite != nil && filters.RequestURLRewrite.Hostname != nil {
+		for i, header := range headers {
+			if header.Name == "Host" {
+				headers[i].Value = *filters.RequestURLRewrite.Hostname
+				break
+			}
+		}
+	}
 
 	if filters == nil || filters.RequestHeaderModifiers == nil {
 		return headers
@@ -829,31 +836,6 @@ func generateProxySetHeaders(filters *dataplane.HTTPFilters, grpc bool) []http.H
 	return append(proxySetHeaders, headers...)
 }
 
-func setHeaderForHTTPSRedirect(filters *dataplane.HTTPFilters, headers []http.Header) {
-	if filters == nil {
-		return
-	}
-
-	if filters.RequestURLRewrite != nil && filters.RequestURLRewrite.Hostname != nil {
-		for i, header := range headers {
-			if header.Name == "Host" {
-				headers[i].Value = *filters.RequestURLRewrite.Hostname
-				break
-			}
-		}
-	}
-	if filters.RequestRedirect != nil &&
-		filters.RequestRedirect.Scheme != nil &&
-		*filters.RequestRedirect.Scheme == http.HTTPSScheme {
-		for i, header := range headers {
-			if header.Name == "X-Forwarded-Proto" {
-				headers[i].Value = http.HTTPSScheme
-				return
-			}
-		}
-	}
-}
-
 func generateResponseHeaders(filters *dataplane.HTTPFilters) http.ResponseHeaders {
 	if filters == nil || filters.ResponseHeaderModifiers == nil {
 		return http.ResponseHeaders{}

diff --git a/internal/mode/static/nginx/config/servers_test.go b/internal/mode/static/nginx/config/servers_test.go
@@ -2681,53 +2681,6 @@ func TestGenerateProxySetHeaders(t *testing.T) {
 				},
 			},
 		},
-		{
-			msg: "request redirect filter with https scheme",
-			filters: &dataplane.HTTPFilters{
-				RequestRedirect: &dataplane.HTTPRequestRedirectFilter{
-					Scheme: helpers.GetPointer("https"),
-				},
-			},
-			expectedHeaders: []http.Header{
-				{
-					Name:  "Host",
-					Value: "$gw_api_compliant_host",
-				},
-				{
-					Name:  "X-Forwarded-For",
-					Value: "$proxy_add_x_forwarded_for",
-				},
-				{
-					Name:  "Upgrade",
-					Value: "$http_upgrade",
-				},
-				{
-					Name:  "Connection",
-					Value: "$connection_upgrade",
-				},
-				{
-					Name:  "X-Real-IP",
-					Value: "$remote_addr",
-				},
-				{
-					Name:  "X-Forwarded-Proto",
-					Value: "https",
-				},
-				{
-					Name:  "X-Forwarded-Host",
-					Value: "$host",
-				},
-				{
-					Name:  "X-Forwarded-Port",
-					Value: "$server_port",
-				},
-			},
-		},
-		{
-			msg:             "no filter set",
-			expectedHeaders: httpBaseHeaders,
-			GRPC:            false,
-		},
 	}
 
 	for _, tc := range tests {