Skip to content

Annotations: Quote auth proxy headers. #13371

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

Merged
merged 1 commit into from
Aug 4, 2025
Merged

Annotations: Quote auth proxy headers. #13371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion internal/ingress/controller/template/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,8 +619,9 @@ func buildAuthProxySetHeaders(headers map[string]string) []string {
}

for name, value := range headers {
res = append(res, fmt.Sprintf("proxy_set_header '%v' '%v';", name, value))
res = append(res, fmt.Sprintf("proxy_set_header %q %q;", name, value))
}

sort.Strings(res)
return res
}
Expand Down
21 changes: 17 additions & 4 deletions internal/ingress/controller/template/template_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,12 +548,25 @@ func TestBuildAuthResponseLua(t *testing.T) {

func TestBuildAuthProxySetHeaders(t *testing.T) {
proxySetHeaders := map[string]string{
"header1": "value1",
"header2": "value2",
"Content-Security-Policy": "default-src 'self'; img-src 'self' example.com",
"Content-Type": "application/json; charset=\"utf-8\"",
"header1": "value1",
"header2": "value2",
"Link": "<https://example.com>; rel=\"preload\"; as=\"script\"; crossorigin=\"anonymous\"",
"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36",
"new\rline": "value1",
"newline2": "valu\ne2",
}

expected := []string{
"proxy_set_header 'header1' 'value1';",
"proxy_set_header 'header2' 'value2';",
`proxy_set_header "Content-Security-Policy" "default-src 'self'; img-src 'self' example.com";`,
`proxy_set_header "Content-Type" "application/json; charset=\"utf-8\"";`,
`proxy_set_header "Link" "<https://example.com>; rel=\"preload\"; as=\"script\"; crossorigin=\"anonymous\"";`,
`proxy_set_header "User-Agent" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36";`,
`proxy_set_header "header1" "value1";`,
`proxy_set_header "header2" "value2";`,
`proxy_set_header "new\rline" "value1";`,
`proxy_set_header "newline2" "valu\ne2";`,
}

headers := buildAuthProxySetHeaders(proxySetHeaders)
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/annotations/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ var _ = framework.DescribeAnnotation("auth-*", func() {
})
})

ginkgo.It(`should set "proxy_set_header 'My-Custom-Header' '42';" when auth-headers are set`, func() {
ginkgo.It(`should set "proxy_set_header "My-Custom-Header" "42";" when auth-headers are set`, func() {
host := authHost

annotations := map[string]string{
Expand All @@ -325,7 +325,7 @@ var _ = framework.DescribeAnnotation("auth-*", func() {

f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, `proxy_set_header 'My-Custom-Header' '42';`)
return strings.Contains(server, `proxy_set_header "My-Custom-Header" "42";`)
})
})

Expand Down