diff --git a/Dockerfile b/Dockerfile index 0e7f8c6e2..d1c888941 100644 --- a/Dockerfile +++ b/Dockerfile @@ -86,6 +86,9 @@ ARG GAMIFICATION_ORG_ID # Universal Nav ARG UNIVERSAL_NAV_URL +# Topgear submissions allowed domains +ARG TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS + ################################################################################ # Setting of environment variables in the Docker image. @@ -154,6 +157,9 @@ ENV GAMIFICATION_ORG_ID=$GAMIFICATION_ORG_ID # Universal nav ENV UNIVERSAL_NAV_URL=$UNIVERSAL_NAV_URL +# Topgear submissions allowed domains +ENV TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS=$TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS + ################################################################################ # Testing and build of the application inside the container. diff --git a/build.sh b/build.sh index a3650db35..9243995e2 100755 --- a/build.sh +++ b/build.sh @@ -29,6 +29,7 @@ docker build -t $TAG \ --build-arg CONTENTFUL_EDU_CDN_API_KEY=$CONTENTFUL_EDU_CDN_API_KEY \ --build-arg CONTENTFUL_EDU_PREVIEW_API_KEY=$CONTENTFUL_EDU_PREVIEW_API_KEY \ --build-arg FILESTACK_API_KEY=$FILESTACK_API_KEY \ + --build-arg TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS=$TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS \ --build-arg FILESTACK_SUBMISSION_CONTAINER=$FILESTACK_SUBMISSION_CONTAINER \ --build-arg MAILCHIMP_API_KEY=$MAILCHIMP_API_KEY \ --build-arg MAILCHIMP_BASE_URL=$MAILCHIMP_BASE_URL \ diff --git a/config/custom-environment-variables.js b/config/custom-environment-variables.js index 38d3c7493..88dd2a9a0 100644 --- a/config/custom-environment-variables.js +++ b/config/custom-environment-variables.js @@ -117,4 +117,5 @@ module.exports = { ORG_ID: 'GAMIFICATION_ORG_ID', ENABLE_BADGE_UI: 'GAMIFICATION_ENABLE_BADGE_UI', }, + TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS: 'TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS', }; diff --git a/config/default.js b/config/default.js index 97d6e1283..8474dd287 100644 --- a/config/default.js +++ b/config/default.js @@ -472,5 +472,5 @@ module.exports = { ACCOUNT_SETTINGS_REDIRECT_URL: 'https://account-settings.topcoder-dev.com', INNOVATION_CHALLENGES_TAG: 'Innovation Challenge', PLATFORM_SITE_URL: 'https://platform.topcoder-dev.com', - TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS: ['wipro365.sharepoint.com', 'wipro365-my.sharepoint.com', 'wipro365-my.sharepoint.com.mcas.ms'], + TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS: 'wipro365.sharepoint.com|wipro365-my.sharepoint.com|wipro365-my.sharepoint.com.mcas.ms', }; diff --git a/src/shared/components/SubmissionPage/FilestackFilePicker/index.jsx b/src/shared/components/SubmissionPage/FilestackFilePicker/index.jsx index 8864968f2..9d828f637 100644 --- a/src/shared/components/SubmissionPage/FilestackFilePicker/index.jsx +++ b/src/shared/components/SubmissionPage/FilestackFilePicker/index.jsx @@ -136,7 +136,7 @@ class FilestackFilePicker extends React.Component { } isDomainAllowed(url) { - const domainReg = new RegExp(`^https?://(${config.TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS.join('|')})/.+`); + const domainReg = new RegExp(`^https?://(${config.TOPGEAR_ALLOWED_SUBMISSIONS_DOMAINS})/.+`); return !!url.match(domainReg); }