From d31447ad930d66d08b68bd13aaef2fd7f236058d Mon Sep 17 00:00:00 2001 From: almera Date: Mon, 17 Dec 2018 15:13:38 -0500 Subject: [PATCH] Change split for REGEX and return * when in array exist --- packages/strapi/lib/middlewares/cors/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/strapi/lib/middlewares/cors/index.js b/packages/strapi/lib/middlewares/cors/index.js index 17c05712a8..85d4b0d1d9 100644 --- a/packages/strapi/lib/middlewares/cors/index.js +++ b/packages/strapi/lib/middlewares/cors/index.js @@ -32,8 +32,11 @@ module.exports = strapi => { } else if (strapi.config.currentEnvironment.security.cors.enabled) { return strapi.koaMiddlewares.kcors({ origin: function(ctx) { - const whitelist = strapi.config.middleware.settings.cors.origin.split(','); + const whitelist = strapi.config.middleware.settings.cors.origin.split(/\s*,\s*/); const requestOrigin = ctx.accept.headers.origin; + if(whitelist.includes('*'){ + return '*'; + } if (!whitelist.includes(requestOrigin)) { return ctx.throw(`${requestOrigin} is not a valid origin`); }