implement elastic#16714 (ability to set CORS origins)

katzelad · Jul 28, 2019 · d38f100 · d38f100
1 parent f5ad6ad
commit d38f100
Showing 1 changed file with 24 additions and 5 deletions.
diff --git a/src/core/server/http/http_config.ts b/src/core/server/http/http_config.ts
@@ -39,17 +39,36 @@ export const config = {
       cors: schema.conditional(
         schema.contextRef('dev'),
         true,
-        schema.object(
-          {
-            origin: schema.arrayOf(schema.string()),
-          },
+        schema.oneOf(
+          [
+            schema.object({
+              origin: schema.arrayOf(schema.string()),
+              additionalHeaders: schema.arrayOf(schema.string()),
+              credentials: schema.boolean(),
+            }),
+            schema.boolean(),
+          ],
           {
             defaultValue: {
               origin: ['*://localhost:9876'], // karma test server
+              additionalHeaders: [],
+              credentials: false,
             },
           }
         ),
-        schema.boolean({ defaultValue: false })
+        schema.oneOf(
+          [
+            schema.object({
+              origin: schema.arrayOf(schema.string()),
+              additionalHeaders: schema.arrayOf(schema.string()),
+              credentials: schema.boolean(),
+            }),
+            schema.boolean(),
+          ],
+          {
+            defaultValue: false,
+          }
+        )
       ),
       host: schema.string({
         defaultValue: 'localhost',