Commit 9274647e by Clinton Blackburn

Yet another fix for credentials CORS

LEARNER-568
parent a9bb5336
...@@ -15,9 +15,14 @@ upstream credentials_app_server { ...@@ -15,9 +15,14 @@ upstream credentials_app_server {
{% endfor %} {% endfor %}
} }
map $http_origin $cors_header { map $http_host $DO_CORS {
default ""; hostnames;
'~*^https?://({{ CREDENTIALS_CORS_ORIGIN_WHITELIST|join('|')|replace('.', '\.') }})' "$http_origin";
default 'false';
{% for host in CREDENTIALS_CORS_ORIGIN_WHITELIST %}
{{ host }} 'true';
{% endfor %}
} }
server { server {
...@@ -43,10 +48,14 @@ server { ...@@ -43,10 +48,14 @@ server {
} }
location ~ ^{{ CREDENTIALS_STATIC_URL }}(?P<file>.*) { location ~ ^{{ CREDENTIALS_STATIC_URL }}(?P<file>.*) {
if ($request_method = 'OPTIONS') { if ($DO_CORS = 'true') {
add_header 'Access-Control-Allow-Origin' "$cors_header" always; add_header 'Access-Control-Allow-Origin' "$http_origin" always;
add_header 'Access-Control-Allow-Methods' 'GET, POST'; add_header 'Access-Control-Allow-Methods' 'GET';
add_header 'Access-Control-Allow-Credentials' 'true' always;
add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range'; add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range';
}
if ($request_method = 'OPTIONS') {
add_header 'Access-Control-Max-Age' 1728000; add_header 'Access-Control-Max-Age' 1728000;
add_header 'Content-Type' 'text/plain charset=UTF-8'; add_header 'Content-Type' 'text/plain charset=UTF-8';
add_header 'Content-Length' 0; add_header 'Content-Length' 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment