Added the ability to specify additional whitelisted domains for CORS for

the credentials service.

LEARNER-516

playbooks/roles/credentials/defaults/main.yml

@@ -109,9 +109,11 @@ CREDENTIALS_FILE_STORAGE_BACKEND:
   DEFAULT_FILE_STORAGE: 'django.core.files.storage.FileSystemStorage'
 
 # Note: the protocol for CORS whitelist values is necessary for matching the correct origin by nginx
-CREDENTIALS_CORS_WHITELIST:
-  - "http://{{ CREDENTIALS_DOMAIN }}"
-  - "https://{{ CREDENTIALS_DOMAIN }}"
+CREDENTIALS_CORS_WHITELIST_DEFAULT:
+  - "{{ CREDENTIALS_DOMAIN }}"
+
+CREDENTIALS_CORS_WHITELIST_EXTRA: []
+CREDENTIALS_CORS_WHITELIST: "{{ CREDENTIALS_CORS_WHITELIST_DEFAULT + CREDENTIALS_CORS_WHITELIST_EXTRA }}"
 
 CREDENTIALS_VERSION: "master"
 CREDENTIALS_REPOS:

playbooks/roles/credentials/templates/edx/app/nginx/sites-available/credentials.j2

@@ -17,7 +17,7 @@ upstream credentials_app_server {
 
 map $http_origin $cors_header {
   default "";
-  '~*^({{ CREDENTIALS_CORS_WHITELIST|join('|')|replace('.', '\.') }})$' "$http_origin";
+  '~*^https?://({{ CREDENTIALS_CORS_WHITELIST|join('|')|replace('.', '\.') }})$' "$http_origin";
 }
 
 server {