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

feat: in cors send origin back when allow-credentials is true

Browse source
This commit is contained in:
Nicolai Willems 2023-02-03 13:40:03 +01:00
parent 4f1ca7a3ce
commit 126b43a9b7
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1786,9 +1786,13 @@ func buildOriginRegex(origin string) string {
return fmt.Sprintf("(%s)", origin)
}
func buildCorsOriginRegex(corsOrigins []string) string {
func buildCorsOriginRegex(corsAllowCredentials string, corsOrigins []string) string {
if len(corsOrigins) == 1 && corsOrigins[0] == "*" {
return "set $cors_origin *;\nset $cors 'true';"
corsOrigin := "*"
if corsAllowCredentials == "true" {
corsOrigin = "$http_origin"
}
return fmt.Sprintf("set $cors_origin %s;\nset $cors 'true';", corsOrigin)
}
var originsRegex string = "if ($http_origin ~* ("

2
rootfs/etc/nginx/template/nginx.tmpl
View file

@ -923,7 +923,7 @@ stream {
{{ $cors := .CorsConfig }}
# Cors Preflight methods needs additional options and different Return Code
{{ if $cors.CorsAllowOrigin }}
{{ buildCorsOriginRegex $cors.CorsAllowOrigin }}
{{ buildCorsOriginRegex $cors.CorsAllowCredentials $cors.CorsAllowOrigin }}
{{ end }}
if ($request_method = 'OPTIONS') {
set $cors ${cors}options;