Allow any hostname for chromium proxy bypass (#74693) (#74777)

* Allow any hostname for chromium proxy bypass * Adds a test for the proxy bypass config * Add wildcard to test
elastic · Aug 12, 2020 · 72a838e · 72a838e
1 parent 8180a38
commit 72a838e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/x-pack/plugins/reporting/server/config/schema.test.ts b/x-pack/plugins/reporting/server/config/schema.test.ts
@@ -126,6 +126,34 @@ describe('Reporting Config Schema', () => {
     ).toMatchObject({ hostname: 'Frodo' });
   });
 
+  it('allows setting a wildcard for chrome proxy bypass', () => {
+    expect(
+      ConfigSchema.validate({
+        capture: {
+          browser: {
+            chromium: {
+              proxy: {
+                enabled: true,
+                server: 'http://example.com:8080',
+                bypass: ['*.example.com', '*bar.example.com', 'bats.example.com'],
+              },
+            },
+          },
+        },
+      }).capture.browser.chromium.proxy
+    ).toMatchInlineSnapshot(`
+      Object {
+        "bypass": Array [
+          "*.example.com",
+          "*bar.example.com",
+          "bats.example.com",
+        ],
+        "enabled": true,
+        "server": "http://example.com:8080",
+      }
+    `);
+  });
+
   it(`logs the proper validation messages`, () => {
     // kibanaServer
     const throwValidationErr = () => ConfigSchema.validate({ kibanaServer: { hostname: '0' } });

diff --git a/x-pack/plugins/reporting/server/config/schema.ts b/x-pack/plugins/reporting/server/config/schema.ts
@@ -97,7 +97,7 @@ const CaptureSchema = schema.object({
         bypass: schema.conditional(
           schema.siblingRef('enabled'),
           true,
-          schema.arrayOf(schema.string({ hostname: true })),
+          schema.arrayOf(schema.string()),
           schema.maybe(schema.never())
         ),
       }),