BUG: fix removed ACL condition in CORS configuration

haproxytech · Apr 22, 2022 · 3ad3409 · 3ad3409
1 parent 9464b03
commit 3ad3409
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/controller/annotations/ingress/resSetCORS.go b/controller/annotations/ingress/resSetCORS.go
@@ -78,6 +78,7 @@ func (a ResSetCORSAnn) Process(k store.K8s, annotations ...map[string]string) (e
 			HdrFormat: origin,
 			Response:  true,
 			CondTest:  a.parent.acl,
+			Cond:      "if",
 		})
 	case "cors-allow-methods":
 		if a.parent.acl == "" {
@@ -99,6 +100,7 @@ func (a ResSetCORSAnn) Process(k store.K8s, annotations ...map[string]string) (e
 			HdrFormat: input,
 			Response:  true,
 			CondTest:  a.parent.acl,
+			Cond:      "if",
 		})
 	case "cors-allow-headers":
 		if a.parent.acl == "" {
@@ -110,6 +112,7 @@ func (a ResSetCORSAnn) Process(k store.K8s, annotations ...map[string]string) (e
 			HdrFormat: "\"" + input + "\"",
 			Response:  true,
 			CondTest:  a.parent.acl,
+			Cond:      "if",
 		})
 	case "cors-max-age":
 		if a.parent.acl == "" {
@@ -129,6 +132,7 @@ func (a ResSetCORSAnn) Process(k store.K8s, annotations ...map[string]string) (e
 			HdrFormat: fmt.Sprintf("\"%d\"", maxage),
 			Response:  true,
 			CondTest:  a.parent.acl,
+			Cond:      "if",
 		})
 	case "cors-allow-credentials":
 		if a.parent.acl == "" {
@@ -139,6 +143,7 @@ func (a ResSetCORSAnn) Process(k store.K8s, annotations ...map[string]string) (e
 			HdrFormat: "\"true\"",
 			Response:  true,
 			CondTest:  a.parent.acl,
+			Cond:      "if",
 		})
 	default:
 		err = fmt.Errorf("unknown cors annotation '%s'", a.name)

diff --git a/controller/haproxy/rules/setHdr.go b/controller/haproxy/rules/setHdr.go
@@ -16,6 +16,7 @@ type SetHdr struct {
 	HdrFormat      string
 	Type           Type
 	CondTest       string
+	Cond           string
 }
 
 func (r SetHdr) GetType() Type {
@@ -50,6 +51,7 @@ func (r SetHdr) Create(client api.HAProxyClient, frontend *models.Frontend, ingr
 			HdrName:   r.HdrName,
 			HdrFormat: r.HdrFormat,
 			CondTest:  r.CondTest,
+			Cond:      r.Cond,
 		}
 		return client.FrontendHTTPResponseRuleCreate(frontend.Name, httpRule, ingressACL)
 	}