Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion internal/mode/static/nginx/config/servers.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"maps"
"slices"
"strconv"
"strings"
gotemplate "text/template"
Expand Down Expand Up @@ -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 {
Expand Down
48 changes: 48 additions & 0 deletions internal/mode/static/nginx/config/servers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
Loading