Skip to content

Commit 162c405

Browse files
committed
Template: Quote mirror variables.
1 parent 49086a5 commit 162c405

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

internal/ingress/controller/template/template.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1645,11 +1645,11 @@ func buildMirrorLocations(locs []*ingress.Location) string {
16451645
mapped.Insert(loc.Mirror.Source)
16461646
buffer.WriteString(fmt.Sprintf(`location = %v {
16471647
internal;
1648-
proxy_set_header Host "%v";
1649-
proxy_pass "%v";
1648+
proxy_set_header Host %v;
1649+
proxy_pass %v;
16501650
}
16511651
1652-
`, loc.Mirror.Source, loc.Mirror.Host, loc.Mirror.Target))
1652+
`, strconv.Quote(loc.Mirror.Source), strconv.Quote(loc.Mirror.Host), strconv.Quote(loc.Mirror.Target)))
16531653
}
16541654

16551655
return buffer.String()

rootfs/etc/nginx/template/nginx.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1258,7 +1258,7 @@ stream {
12581258
{{ buildOpentelemetryForLocation $all.Cfg.EnableOpentelemetry $all.Cfg.OpentelemetryTrustIncomingSpan $location }}
12591259

12601260
{{ if $location.Mirror.Source }}
1261-
mirror {{ $location.Mirror.Source }};
1261+
mirror {{ $location.Mirror.Source | quote }};
12621262
mirror_request_body {{ $location.Mirror.RequestBody }};
12631263
{{ end }}
12641264

test/e2e/annotations/mirror.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ var _ = framework.DescribeAnnotation("mirror-*", func() {
4343

4444
f.WaitForNginxServer(host,
4545
func(server string) bool {
46-
return strings.Contains(server, fmt.Sprintf("mirror /_mirror-%v;", ing.UID)) &&
46+
return strings.Contains(server, fmt.Sprintf("mirror \"/_mirror-%v\";", ing.UID)) &&
4747
strings.Contains(server, "mirror_request_body on;")
4848
})
4949
})
@@ -58,7 +58,7 @@ var _ = framework.DescribeAnnotation("mirror-*", func() {
5858

5959
f.WaitForNginxServer(host,
6060
func(server string) bool {
61-
return strings.Contains(server, fmt.Sprintf("mirror /_mirror-%v;", ing.UID)) &&
61+
return strings.Contains(server, fmt.Sprintf("mirror \"/_mirror-%v\";", ing.UID)) &&
6262
strings.Contains(server, "mirror_request_body on;") &&
6363
strings.Contains(server, `proxy_pass "https://test.env.com/$request_uri";`)
6464
})
@@ -75,7 +75,7 @@ var _ = framework.DescribeAnnotation("mirror-*", func() {
7575

7676
f.WaitForNginxServer(host,
7777
func(server string) bool {
78-
return strings.Contains(server, fmt.Sprintf("mirror /_mirror-%v;", ing.UID)) &&
78+
return strings.Contains(server, fmt.Sprintf("mirror \"/_mirror-%v\";", ing.UID)) &&
7979
strings.Contains(server, "mirror_request_body off;")
8080
})
8181
})

0 commit comments

Comments
 (0)