Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix nginx breaking & remove unused code for ProxySetHeaders annotation #5426

Merged
merged 5 commits into from Apr 29, 2024
Merged

Fix nginx breaking & remove unused code for ProxySetHeaders annotation #5426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d430e3a
Fix invalid character in value & remove unused code
AlexFenlon Apr 18, 2024
ac2133c
Simplify to allow for 1 restriction
AlexFenlon Apr 18, 2024
3e5bd65
Merge branch 'main' into fix/proxy-set-headers-annotation-bugs
AlexFenlon Apr 26, 2024
14b3f5a
Merge branch 'main' into fix/proxy-set-headers-annotation-bugs
AlexFenlon Apr 26, 2024
8dc5327
Merge branch 'main' into fix/proxy-set-headers-annotation-bugs
AlexFenlon Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 0 additions & 16 deletions internal/configs/configmaps.go
View file
Open in desktop
Expand Up @@ -3,8 +3,6 @@ package configs
import (
"strings"

"github.com/nginxinc/kubernetes-ingress/internal/configs/version2"

"github.com/golang/glog"
v1 "k8s.io/api/core/v1"

Expand Down Expand Up @@ -68,20 +66,6 @@ func ParseConfigMap(cfgm *v1.ConfigMap, nginxPlus bool, hasAppProtect bool, hasA
cfgParams.ProxyPassHeaders = proxyPassHeaders
}

if proxySetHeaders, exists := GetMapKeyAsStringSlice(cfgm.Data, "proxy-set-headers", cfgm, ","); exists {
var headers []version2.Header
for _, headerAndValue := range proxySetHeaders {
parts := strings.SplitN(headerAndValue, " ", 2)
name := strings.TrimSpace(parts[0])
var value string
if len(parts) > 1 {
value = strings.TrimSpace(parts[1])
}
headers = append(headers, version2.Header{Name: name, Value: value})
}
cfgParams.ProxySetHeaders = headers
}

if clientMaxBodySize, exists := cfgm.Data["client-max-body-size"]; exists {
cfgParams.ClientMaxBodySize = clientMaxBodySize
}
Expand Down
6 changes: 6 additions & 0 deletions internal/configs/version1/template_helper_test.go
View file
Open in desktop
Expand Up @@ -588,6 +588,12 @@ func TestGenerateProxySetHeadersForInvalidHeadersForErrorsInMaster(t *testing.T)
"nginx.org/proxy-set-headers": "X-Forwarded-ABC!,BVC§",
},
},
{
name: "Header Value With invalid Characters",
annotations: map[string]string{
"nginx.org/proxy-set-headers": "X-Forwarded ABC$",
},
},
{
name: "Headers with invalid Format",
annotations: map[string]string{
Expand Down
4 changes: 4 additions & 0 deletions internal/k8s/validation.go
View file
Open in desktop
Expand Up @@ -437,6 +437,10 @@ func validateProxySetHeaderAnnotation(context *annotationValidationContext) fiel

value := strings.TrimSpace(parts[1])

if strings.Contains(value, "$") {
allErrs = append(allErrs, field.Invalid(context.fieldPath, header, "invalid character in value: $"))
}

if name == "" {
allErrs = append(allErrs, field.Invalid(context.fieldPath, header, "empty header name: "+header))
continue
Expand Down