DevFW-CICD/ingress-nginx-helm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix missing \- in regex expression for CORS wildcard domain (#7904)

Browse source
This commit is contained in:
Christopher Larivière 2021-11-11 13:26:08 -05:00 committed by GitHub
parent af232df1af
commit 100057d0c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/ingress/controller/template/template.go
View file

@ -1680,7 +1680,7 @@ func convertGoSliceIntoLuaTable(goSliceInterface interface{}, emptyStringAsNil b
func buildOriginRegex(origin string) string { func buildOriginRegex(origin string) string {
origin = regexp.QuoteMeta(origin) origin = regexp.QuoteMeta(origin)
origin = strings.Replace(origin, "\\*", "[A-Za-z0-9]+", 1) origin = strings.Replace(origin, "\\*", `[A-Za-z0-9\-]+`, 1)
return fmt.Sprintf("(%s)", origin) return fmt.Sprintf("(%s)", origin)
} }

16
test/e2e/annotations/cors.go
View file

@ -425,6 +425,7 @@ var _ = framework.DescribeAnnotation("cors-*", func() {
ginkgo.It("should allow - matching origin with wildcard origin (2 subdomains)", func() { ginkgo.It("should allow - matching origin with wildcard origin (2 subdomains)", func() {
host := "cors.foo.com" host := "cors.foo.com"
origin := "http://foo.origin.cors.com" origin := "http://foo.origin.cors.com"
origin2 := "http://bar-foo.origin.cors.com"
annotations := map[string]string{ annotations := map[string]string{
"nginx.ingress.kubernetes.io/enable-cors": "true", "nginx.ingress.kubernetes.io/enable-cors": "true",
"nginx.ingress.kubernetes.io/cors-allow-origin": "http://*.origin.cors.com, http://*.origin.com:8080", "nginx.ingress.kubernetes.io/cors-allow-origin": "http://*.origin.cors.com, http://*.origin.com:8080",
@ -447,6 +448,21 @@ var _ = framework.DescribeAnnotation("cors-*", func() {
Expect(). Expect().
Status(http.StatusOK).Headers(). Status(http.StatusOK).Headers().
ValueEqual("Access-Control-Allow-Origin", []string{origin}) ValueEqual("Access-Control-Allow-Origin", []string{origin})
f.HTTPTestClient().
GET("/").
WithHeader("Host", host).
WithHeader("Origin", origin2).
Expect().
Headers().ContainsKey("Access-Control-Allow-Origin")
f.HTTPTestClient().
GET("/").
WithHeader("Host", host).
WithHeader("Origin", origin2).
Expect().
Status(http.StatusOK).Headers().
ValueEqual("Access-Control-Allow-Origin", []string{origin2})
}) })
ginkgo.It("should not allow - unmatching origin with wildcard origin (2 subdomains)", func() { ginkgo.It("should not allow - unmatching origin with wildcard origin (2 subdomains)", func() {