From 0112057aef399a599bd11de73516bf36eab94780 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Mon, 8 Jun 2020 19:08:16 +0200
Subject: [PATCH 01/24] convert kbn test config into TS

---
 .../kbn-test/src/kbn/{index.js => index.ts}   |  0
 ...{kbn_test_config.js => kbn_test_config.ts} | 28 ++++++++++++-------
 .../kbn-test/src/kbn/{users.js => users.ts}   |  0
 3 files changed, 18 insertions(+), 10 deletions(-)
 rename packages/kbn-test/src/kbn/{index.js => index.ts} (100%)
 rename packages/kbn-test/src/kbn/{kbn_test_config.js => kbn_test_config.ts} (75%)
 rename packages/kbn-test/src/kbn/{users.js => users.ts} (100%)

diff --git a/packages/kbn-test/src/kbn/index.js b/packages/kbn-test/src/kbn/index.ts
similarity index 100%
rename from packages/kbn-test/src/kbn/index.js
rename to packages/kbn-test/src/kbn/index.ts
diff --git a/packages/kbn-test/src/kbn/kbn_test_config.js b/packages/kbn-test/src/kbn/kbn_test_config.ts
similarity index 75%
rename from packages/kbn-test/src/kbn/kbn_test_config.js
rename to packages/kbn-test/src/kbn/kbn_test_config.ts
index c43efabb4b747..3c96086920941 100644
--- a/packages/kbn-test/src/kbn/kbn_test_config.js
+++ b/packages/kbn-test/src/kbn/kbn_test_config.ts
@@ -16,26 +16,34 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import { kibanaTestUser } from './users';
 import url from 'url';
+import { kibanaTestUser } from './users';
+
+interface UrlParts {
+  protocol: string;
+  hostname: string;
+  port: number;
+  auth: string;
+  username: string;
+  password: string;
+}
 
 export const kbnTestConfig = new (class KbnTestConfig {
   getPort() {
     return this.getUrlParts().port;
   }
 
-  getUrlParts() {
+  getUrlParts(): UrlParts {
     // allow setting one complete TEST_KIBANA_URL for ES like https://elastic:changeme@example.com:9200
     if (process.env.TEST_KIBANA_URL) {
       const testKibanaUrl = url.parse(process.env.TEST_KIBANA_URL);
       return {
-        protocol: testKibanaUrl.protocol.slice(0, -1),
-        hostname: testKibanaUrl.hostname,
-        port: parseInt(testKibanaUrl.port, 10),
-        auth: testKibanaUrl.auth,
-        username: testKibanaUrl.auth.split(':')[0],
-        password: testKibanaUrl.auth.split(':')[1],
+        protocol: testKibanaUrl.protocol!.slice(0, -1),
+        hostname: testKibanaUrl.hostname!,
+        port: parseInt(testKibanaUrl.port!, 10),
+        auth: testKibanaUrl.auth!,
+        username: testKibanaUrl.auth!.split(':')[0],
+        password: testKibanaUrl.auth!.split(':')[1],
       };
     }
 
@@ -44,7 +52,7 @@ export const kbnTestConfig = new (class KbnTestConfig {
     return {
       protocol: process.env.TEST_KIBANA_PROTOCOL || 'http',
       hostname: process.env.TEST_KIBANA_HOSTNAME || 'localhost',
-      port: parseInt(process.env.TEST_KIBANA_PORT, 10) || 5620,
+      port: parseInt(process.env.TEST_KIBANA_PORT!, 10) || 5620,
       auth: `${username}:${password}`,
       username,
       password,
diff --git a/packages/kbn-test/src/kbn/users.js b/packages/kbn-test/src/kbn/users.ts
similarity index 100%
rename from packages/kbn-test/src/kbn/users.js
rename to packages/kbn-test/src/kbn/users.ts

From e3653653f7ee7544128c3fb9a0ba461f1c130e0a Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Mon, 8 Jun 2020 19:22:26 +0200
Subject: [PATCH 02/24] add test  for Kibana embedded in iframe

---
 x-pack/test/functional_embedded/config.ts     | 58 +++++++++++++++++++
 .../ftr_provider_context.d.ts                 | 12 ++++
 .../plugins/iframe_embedded/kibana.json       |  7 +++
 .../plugins/iframe_embedded/package.json      | 15 +++++
 .../plugins/iframe_embedded/server/index.ts   | 11 ++++
 .../plugins/iframe_embedded/server/plugin.ts  | 48 +++++++++++++++
 x-pack/test/functional_embedded/services.ts   |  9 +++
 .../tests/iframe_embedded.ts                  | 41 +++++++++++++
 .../test/functional_embedded/tests/index.ts   | 14 +++++
 9 files changed, 215 insertions(+)
 create mode 100644 x-pack/test/functional_embedded/config.ts
 create mode 100644 x-pack/test/functional_embedded/ftr_provider_context.d.ts
 create mode 100644 x-pack/test/functional_embedded/plugins/iframe_embedded/kibana.json
 create mode 100644 x-pack/test/functional_embedded/plugins/iframe_embedded/package.json
 create mode 100644 x-pack/test/functional_embedded/plugins/iframe_embedded/server/index.ts
 create mode 100644 x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts
 create mode 100644 x-pack/test/functional_embedded/services.ts
 create mode 100644 x-pack/test/functional_embedded/tests/iframe_embedded.ts
 create mode 100644 x-pack/test/functional_embedded/tests/index.ts

diff --git a/x-pack/test/functional_embedded/config.ts b/x-pack/test/functional_embedded/config.ts
new file mode 100644
index 0000000000000..b407cc58e685d
--- /dev/null
+++ b/x-pack/test/functional_embedded/config.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { resolve } from 'path';
+// import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
+import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+import { pageObjects } from '../functional/page_objects';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const kibanaFunctionalConfig = await readConfigFile(require.resolve('../functional/config.js'));
+
+  const iframeEmbeddedPlugin = resolve(__dirname, './plugins/iframe_embedded');
+
+  const servers = {
+    ...kibanaFunctionalConfig.get('servers'),
+    elasticsearch: {
+      ...kibanaFunctionalConfig.get('servers.elasticsearch'),
+    },
+    kibana: {
+      ...kibanaFunctionalConfig.get('servers.kibana'),
+      // protocol: 'https',
+    },
+  };
+
+  return {
+    testFiles: [require.resolve('./tests')],
+    servers,
+    services: kibanaFunctionalConfig.get('services'),
+    pageObjects,
+    junit: {
+      reportName: 'Kibana Embedded in iframe with X-Pack Security',
+    },
+
+    esTestCluster: kibanaFunctionalConfig.get('esTestCluster'),
+    apps: {
+      ...kibanaFunctionalConfig.get('apps'),
+    },
+
+    kbnTestServer: {
+      ...kibanaFunctionalConfig.get('kbnTestServer'),
+      serverArgs: [
+        ...kibanaFunctionalConfig.get('kbnTestServer.serverArgs'),
+        `--plugin-path=${iframeEmbeddedPlugin}`,
+        // '--server.ssl.enabled=true',
+        // `--server.ssl.key=${KBN_KEY_PATH}`,
+        // `--server.ssl.certificate=${KBN_CERT_PATH}`,
+        // `--server.ssl.certificateAuthorities=${JSON.stringify([CA_CERT_PATH])}`,
+        // `--server.ssl.clientAuthentication=optional`,
+
+        // '--xpack.security.sameSiteCookies=None',
+        // '--xpack.security.secureCookies=true',
+      ],
+    },
+  };
+}
diff --git a/x-pack/test/functional_embedded/ftr_provider_context.d.ts b/x-pack/test/functional_embedded/ftr_provider_context.d.ts
new file mode 100644
index 0000000000000..5646c06a3cd30
--- /dev/null
+++ b/x-pack/test/functional_embedded/ftr_provider_context.d.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { GenericFtrProviderContext } from '@kbn/test/types/ftr';
+import { pageObjects } from '../functional/page_objects';
+import { services } from './services';
+
+export type FtrProviderContext = GenericFtrProviderContext<typeof services, typeof pageObjects>;
+export { pageObjects };
diff --git a/x-pack/test/functional_embedded/plugins/iframe_embedded/kibana.json b/x-pack/test/functional_embedded/plugins/iframe_embedded/kibana.json
new file mode 100644
index 0000000000000..ea9f55bd21c6e
--- /dev/null
+++ b/x-pack/test/functional_embedded/plugins/iframe_embedded/kibana.json
@@ -0,0 +1,7 @@
+{
+  "id": "iframe_embedded",
+  "version": "1.0.0",
+  "kibanaVersion": "kibana",
+  "server": true,
+  "ui": false
+}
diff --git a/x-pack/test/functional_embedded/plugins/iframe_embedded/package.json b/x-pack/test/functional_embedded/plugins/iframe_embedded/package.json
new file mode 100644
index 0000000000000..11ddde91459a4
--- /dev/null
+++ b/x-pack/test/functional_embedded/plugins/iframe_embedded/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "iframe_embedded",
+  "version": "0.0.0",
+  "kibana": {
+    "version": "kibana"
+  },
+  "main": "target/test/plugin_api_integration/plugins/event_log",
+  "scripts": {
+    "kbn": "node ../../../../../scripts/kbn.js",
+    "build": "rm -rf './target' && tsc"
+  },
+  "devDependencies": {
+    "typescript": "3.7.2"
+  }
+}
diff --git a/x-pack/test/functional_embedded/plugins/iframe_embedded/server/index.ts b/x-pack/test/functional_embedded/plugins/iframe_embedded/server/index.ts
new file mode 100644
index 0000000000000..976ef19d4d8a7
--- /dev/null
+++ b/x-pack/test/functional_embedded/plugins/iframe_embedded/server/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { PluginInitializerContext } from 'kibana/server';
+import { IframeEmbeddedPlugin } from './plugin';
+
+export const plugin = (initContext: PluginInitializerContext) =>
+  new IframeEmbeddedPlugin(initContext);
diff --git a/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts b/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts
new file mode 100644
index 0000000000000..ca787cd84784a
--- /dev/null
+++ b/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts
@@ -0,0 +1,48 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import Url from 'url';
+import { Plugin, CoreSetup, PluginInitializerContext } from 'src/core/server';
+import { kbnTestConfig } from '@kbn/test';
+
+function renderBody(iframeUrl: string = 'https://localhost:5601') {
+  return `
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Kibana embedded in iframe</title>
+  </head>
+  <body>
+    <iframe data-test-subj="iframe_embedded" width="1000" height="1200" src="${iframeUrl}" frameborder="0"/>
+  </body>
+</html>
+`;
+}
+export class IframeEmbeddedPlugin implements Plugin {
+  constructor(initializerContext: PluginInitializerContext) {}
+
+  public setup(core: CoreSetup) {
+    const router = core.http.createRouter();
+    router.get(
+      {
+        path: '/iframe_embedded',
+        validate: false,
+      },
+      async (context, request, response) => {
+        const { protocol, hostname, port } = kbnTestConfig.getUrlParts();
+        const kibanaUrl = Url.format({ protocol, hostname, port });
+        return response.ok({
+          body: renderBody(kibanaUrl),
+          headers: {
+            'content-type': 'text/html',
+          },
+        });
+      }
+    );
+  }
+  public start() {}
+  public stop() {}
+}
diff --git a/x-pack/test/functional_embedded/services.ts b/x-pack/test/functional_embedded/services.ts
new file mode 100644
index 0000000000000..1bdf67abd89d0
--- /dev/null
+++ b/x-pack/test/functional_embedded/services.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { services as functionalServices } from '../functional/services';
+
+export const services = functionalServices;
diff --git a/x-pack/test/functional_embedded/tests/iframe_embedded.ts b/x-pack/test/functional_embedded/tests/iframe_embedded.ts
new file mode 100644
index 0000000000000..746c71997827e
--- /dev/null
+++ b/x-pack/test/functional_embedded/tests/iframe_embedded.ts
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import Url from 'url';
+import { By, until } from 'selenium-webdriver';
+import testSubjSelector from '@kbn/test-subj-selector';
+import { kbnTestConfig } from '@kbn/test';
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+  const PageObjects = getPageObjects(['security', 'common']);
+  const browser = getService('browser');
+  const testSubjects = getService('testSubjects');
+
+  const WD = getService('__webdriver__');
+
+  describe('Kibana embedded', () => {
+    it('should open Kibana for logged-in user', async () => {
+      await PageObjects.security.login();
+      const { protocol, hostname, port } = await kbnTestConfig.getUrlParts();
+      const url = Url.format({
+        protocol,
+        hostname,
+        port,
+        pathname: 'iframe_embedded',
+      });
+
+      await browser.navigateTo(url);
+
+      const iframe = await testSubjects.find('iframe_embedded');
+      WD.driver.switchTo().frame(iframe._webElement);
+
+      const selector = By.css(testSubjSelector('kibanaChrome'));
+      const minute = 60000;
+      await WD.driver.wait(until.elementLocated(selector), minute);
+    });
+  });
+}
diff --git a/x-pack/test/functional_embedded/tests/index.ts b/x-pack/test/functional_embedded/tests/index.ts
new file mode 100644
index 0000000000000..7c7b3bd23fe30
--- /dev/null
+++ b/x-pack/test/functional_embedded/tests/index.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('apis', function () {
+    this.tags('ciGroup6');
+    loadTestFile(require.resolve('./iframe_embedded'));
+  });
+}

From c41cf0c679e37a433d7b194f076c1319e7811bb6 Mon Sep 17 00:00:00 2001
From: restrry <restrry@gmail.com>
Date: Mon, 8 Jun 2020 21:29:04 +0200
Subject: [PATCH 03/24] run embedded tests in functional suite

---
 x-pack/scripts/functional_tests.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x-pack/scripts/functional_tests.js b/x-pack/scripts/functional_tests.js
index 4392299a78e72..d9c06d8b91ae6 100644
--- a/x-pack/scripts/functional_tests.js
+++ b/x-pack/scripts/functional_tests.js
@@ -50,6 +50,7 @@ const onlyNotInCoverageTests = [
   require.resolve('../test/licensing_plugin/config.legacy.ts'),
   require.resolve('../test/endpoint_api_integration_no_ingest/config.ts'),
   require.resolve('../test/reporting_api_integration/config.js'),
+  require.resolve('../test/functional_embedded/config.ts'),
 ];
 
 require('@kbn/plugin-helpers').babelRegister();

From 54756f4cafba9c255b084afcdae4d909bc3b7678 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Wed, 10 Jun 2020 15:25:32 +0200
Subject: [PATCH 04/24] ignore tls errors in functional tests by default

---
 .../kbn-test/src/functional_test_runner/cli.ts   | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/kbn-test/src/functional_test_runner/cli.ts b/packages/kbn-test/src/functional_test_runner/cli.ts
index fd5ee5ad3ae44..9560db30c001e 100644
--- a/packages/kbn-test/src/functional_test_runner/cli.ts
+++ b/packages/kbn-test/src/functional_test_runner/cli.ts
@@ -69,6 +69,10 @@ export function runFtrCli() {
         process.env.TEST_BROWSER_HEADLESS = '1';
       }
 
+      if (flags['ignore-tls-errors']) {
+        process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+      }
+
       let teardownRun = false;
       const teardown = async (err?: Error) => {
         if (teardownRun) return;
@@ -121,10 +125,19 @@ export function runFtrCli() {
           'exclude-tag',
           'kibana-install-dir',
         ],
-        boolean: ['bail', 'invert', 'test-stats', 'updateBaselines', 'throttle', 'headless'],
+        boolean: [
+          'bail',
+          'invert',
+          'test-stats',
+          'updateBaselines',
+          'throttle',
+          'headless',
+          'ignore-tls-errors',
+        ],
         default: {
           config: 'test/functional/config.js',
           debug: true,
+          ['ignore-tls-errors']: true,
         },
         help: `
         --config=path      path to a config file
@@ -140,6 +153,7 @@ export function runFtrCli() {
         --kibana-install-dir  directory where the Kibana install being tested resides
         --throttle         enable network throttling in Chrome browser
         --headless         run browser in headless mode
+        --ignore-tls-errors ignore self-signed cert errors
       `,
       },
     }

From d049acf4295c5faa49d6a5fe181b3d33675b5f97 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Wed, 10 Jun 2020 15:26:15 +0200
Subject: [PATCH 05/24] switch test to https

---
 x-pack/test/functional_embedded/config.ts         | 15 +++++++--------
 .../plugins/iframe_embedded/server/plugin.ts      |  5 +++--
 .../functional_embedded/tests/iframe_embedded.ts  |  8 +++++---
 x-pack/test/functional_embedded/tests/index.ts    |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/x-pack/test/functional_embedded/config.ts b/x-pack/test/functional_embedded/config.ts
index b407cc58e685d..2439ea952537f 100644
--- a/x-pack/test/functional_embedded/config.ts
+++ b/x-pack/test/functional_embedded/config.ts
@@ -5,7 +5,7 @@
  */
 
 import { resolve } from 'path';
-// import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
+import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
 import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
 import { pageObjects } from '../functional/page_objects';
 
@@ -21,7 +21,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     },
     kibana: {
       ...kibanaFunctionalConfig.get('servers.kibana'),
-      // protocol: 'https',
+      protocol: 'https',
     },
   };
 
@@ -44,14 +44,13 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       serverArgs: [
         ...kibanaFunctionalConfig.get('kbnTestServer.serverArgs'),
         `--plugin-path=${iframeEmbeddedPlugin}`,
-        // '--server.ssl.enabled=true',
-        // `--server.ssl.key=${KBN_KEY_PATH}`,
-        // `--server.ssl.certificate=${KBN_CERT_PATH}`,
-        // `--server.ssl.certificateAuthorities=${JSON.stringify([CA_CERT_PATH])}`,
-        // `--server.ssl.clientAuthentication=optional`,
+        '--server.ssl.enabled=true',
+        `--server.ssl.key=${KBN_KEY_PATH}`,
+        `--server.ssl.certificate=${KBN_CERT_PATH}`,
+        `--server.ssl.certificateAuthorities=${JSON.stringify([CA_CERT_PATH])}`,
 
         // '--xpack.security.sameSiteCookies=None',
-        // '--xpack.security.secureCookies=true',
+        '--xpack.security.secureCookies=true',
       ],
     },
   };
diff --git a/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts b/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts
index ca787cd84784a..3dba3737222d7 100644
--- a/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts
+++ b/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts
@@ -32,8 +32,9 @@ export class IframeEmbeddedPlugin implements Plugin {
         validate: false,
       },
       async (context, request, response) => {
-        const { protocol, hostname, port } = kbnTestConfig.getUrlParts();
-        const kibanaUrl = Url.format({ protocol, hostname, port });
+        const { hostname, port } = kbnTestConfig.getUrlParts();
+        const kibanaUrl = Url.format({ protocol: 'https', hostname, port });
+
         return response.ok({
           body: renderBody(kibanaUrl),
           headers: {
diff --git a/x-pack/test/functional_embedded/tests/iframe_embedded.ts b/x-pack/test/functional_embedded/tests/iframe_embedded.ts
index 746c71997827e..f7cc6722b0247 100644
--- a/x-pack/test/functional_embedded/tests/iframe_embedded.ts
+++ b/x-pack/test/functional_embedded/tests/iframe_embedded.ts
@@ -6,21 +6,23 @@
 import Url from 'url';
 import { By, until } from 'selenium-webdriver';
 import testSubjSelector from '@kbn/test-subj-selector';
-import { kbnTestConfig } from '@kbn/test';
 
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['security', 'common']);
   const browser = getService('browser');
+  const config = getService('config');
   const testSubjects = getService('testSubjects');
 
   const WD = getService('__webdriver__');
 
-  describe('Kibana embedded', () => {
+  describe('in iframe', () => {
     it('should open Kibana for logged-in user', async () => {
       await PageObjects.security.login();
-      const { protocol, hostname, port } = await kbnTestConfig.getUrlParts();
+
+      const { protocol, hostname, port } = config.get('servers.kibana');
+
       const url = Url.format({
         protocol,
         hostname,
diff --git a/x-pack/test/functional_embedded/tests/index.ts b/x-pack/test/functional_embedded/tests/index.ts
index 7c7b3bd23fe30..5e0837cb4958e 100644
--- a/x-pack/test/functional_embedded/tests/index.ts
+++ b/x-pack/test/functional_embedded/tests/index.ts
@@ -7,7 +7,7 @@
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
-  describe('apis', function () {
+  describe('Kibana embedded', function () {
     this.tags('ciGroup6');
     loadTestFile(require.resolve('./iframe_embedded'));
   });

From 02a5dfb0ba0a8a8b7ed7e6dd4a8564a5321ddfcc Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Mon, 15 Jun 2020 14:32:18 +0200
Subject: [PATCH 06/24] remove env vars mutation

---
 .../kbn-test/src/functional_test_runner/cli.ts    | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/packages/kbn-test/src/functional_test_runner/cli.ts b/packages/kbn-test/src/functional_test_runner/cli.ts
index 9560db30c001e..ed139cffff771 100644
--- a/packages/kbn-test/src/functional_test_runner/cli.ts
+++ b/packages/kbn-test/src/functional_test_runner/cli.ts
@@ -69,10 +69,6 @@ export function runFtrCli() {
         process.env.TEST_BROWSER_HEADLESS = '1';
       }
 
-      if (flags['ignore-tls-errors']) {
-        process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
-      }
-
       let teardownRun = false;
       const teardown = async (err?: Error) => {
         if (teardownRun) return;
@@ -125,19 +121,10 @@ export function runFtrCli() {
           'exclude-tag',
           'kibana-install-dir',
         ],
-        boolean: [
-          'bail',
-          'invert',
-          'test-stats',
-          'updateBaselines',
-          'throttle',
-          'headless',
-          'ignore-tls-errors',
-        ],
+        boolean: ['bail', 'invert', 'test-stats', 'updateBaselines', 'throttle', 'headless'],
         default: {
           config: 'test/functional/config.js',
           debug: true,
-          ['ignore-tls-errors']: true,
         },
         help: `
         --config=path      path to a config file

From ab577505b265e9d0c06172f16f365eb77d264318 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Mon, 15 Jun 2020 14:33:18 +0200
Subject: [PATCH 07/24] allow to pass ssl config to Kibana

---
 .../src/functional_test_runner/lib/config/schema.ts       | 8 ++++++++
 x-pack/test/functional_embedded/config.ts                 | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts b/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts
index 29ec28175a851..1ed68bd514daa 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts
@@ -38,6 +38,14 @@ const urlPartsSchema = () =>
       password: Joi.string(),
       pathname: Joi.string().regex(/^\//, 'start with a /'),
       hash: Joi.string().regex(/^\//, 'start with a /'),
+      ssl: Joi.object()
+        .keys({
+          enabled: Joi.boolean().default(false),
+          certificate: Joi.string().optional(),
+          certificateAuthorities: Joi.string().optional(),
+          key: Joi.string().optional(),
+        })
+        .default(),
     })
     .default();
 
diff --git a/x-pack/test/functional_embedded/config.ts b/x-pack/test/functional_embedded/config.ts
index 2439ea952537f..9818f40d323b9 100644
--- a/x-pack/test/functional_embedded/config.ts
+++ b/x-pack/test/functional_embedded/config.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import Fs from 'fs';
 import { resolve } from 'path';
 import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
 import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
@@ -22,6 +23,12 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     kibana: {
       ...kibanaFunctionalConfig.get('servers.kibana'),
       protocol: 'https',
+      ssl: {
+        enabled: true,
+        key: Fs.readFileSync(KBN_KEY_PATH).toString('utf8'),
+        certificate: Fs.readFileSync(KBN_CERT_PATH).toString('utf8'),
+        certificateAuthorities: Fs.readFileSync(CA_CERT_PATH).toString('utf8'),
+      },
     },
   };
 

From 6342329106723c4801e28d12e5ecbe737964f3e1 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Mon, 15 Jun 2020 14:44:29 +0200
Subject: [PATCH 08/24] pass ssl config to axios

---
 .../src/kbn_client/kbn_client_requester.ts    | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/packages/kbn-dev-utils/src/kbn_client/kbn_client_requester.ts b/packages/kbn-dev-utils/src/kbn_client/kbn_client_requester.ts
index ea4159de55749..f8cd85aff3bc0 100644
--- a/packages/kbn-dev-utils/src/kbn_client/kbn_client_requester.ts
+++ b/packages/kbn-dev-utils/src/kbn_client/kbn_client_requester.ts
@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 import Url from 'url';
-
+import Https from 'https';
 import Axios from 'axios';
 
 import { isAxiosRequestError, isAxiosResponseError } from '../axios';
@@ -70,13 +69,33 @@ const delay = (ms: number) =>
     setTimeout(resolve, ms);
   });
 
+export interface KibanaConfig {
+  url: string;
+  ssl:
+    | undefined
+    | {
+        enabled: boolean;
+        key: string;
+        certificate: string;
+        certificateAuthorities: string;
+      };
+}
+
 export class KbnClientRequester {
-  constructor(private readonly log: ToolingLog, private readonly kibanaUrls: string[]) {}
+  private readonly httpsAgent: Https.Agent | null;
+  constructor(private readonly log: ToolingLog, private readonly kibanaConfig: KibanaConfig) {
+    this.httpsAgent =
+      kibanaConfig.ssl && kibanaConfig.ssl.enabled
+        ? new Https.Agent({
+            cert: kibanaConfig.ssl.certificate,
+            key: kibanaConfig.ssl.key,
+            ca: kibanaConfig.ssl.certificateAuthorities,
+          })
+        : null;
+  }
 
   private pickUrl() {
-    const url = this.kibanaUrls.shift()!;
-    this.kibanaUrls.push(url);
-    return url;
+    return this.kibanaConfig.url;
   }
 
   public resolveUrl(relativeUrl: string = '/') {
@@ -101,6 +120,7 @@ export class KbnClientRequester {
           headers: {
             'kbn-xsrf': 'kbn-client',
           },
+          httpsAgent: this.httpsAgent,
         });
 
         return response.data;

From 7c1b30d787528714b4821553a8436341cb09f6a1 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Mon, 15 Jun 2020 14:45:13 +0200
Subject: [PATCH 09/24] adopt KbnClient interfaces

---
 packages/kbn-dev-utils/src/kbn_client/kbn_client.ts | 8 ++++----
 src/es_archiver/es_archiver.ts                      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/kbn-dev-utils/src/kbn_client/kbn_client.ts b/packages/kbn-dev-utils/src/kbn_client/kbn_client.ts
index 2eb6c6cc5aac6..861ea0988692c 100644
--- a/packages/kbn-dev-utils/src/kbn_client/kbn_client.ts
+++ b/packages/kbn-dev-utils/src/kbn_client/kbn_client.ts
@@ -18,7 +18,7 @@
  */
 
 import { ToolingLog } from '../tooling_log';
-import { KbnClientRequester, ReqOptions } from './kbn_client_requester';
+import { KibanaConfig, KbnClientRequester, ReqOptions } from './kbn_client_requester';
 import { KbnClientStatus } from './kbn_client_status';
 import { KbnClientPlugins } from './kbn_client_plugins';
 import { KbnClientVersion } from './kbn_client_version';
@@ -26,7 +26,7 @@ import { KbnClientSavedObjects } from './kbn_client_saved_objects';
 import { KbnClientUiSettings, UiSettingValues } from './kbn_client_ui_settings';
 
 export class KbnClient {
-  private readonly requester = new KbnClientRequester(this.log, this.kibanaUrls);
+  private readonly requester = new KbnClientRequester(this.log, this.kibanaConfig);
   readonly status = new KbnClientStatus(this.requester);
   readonly plugins = new KbnClientPlugins(this.status);
   readonly version = new KbnClientVersion(this.status);
@@ -43,10 +43,10 @@ export class KbnClient {
    */
   constructor(
     private readonly log: ToolingLog,
-    private readonly kibanaUrls: string[],
+    private readonly kibanaConfig: KibanaConfig,
     private readonly uiSettingDefaults?: UiSettingValues
   ) {
-    if (!kibanaUrls.length) {
+    if (!kibanaConfig.url) {
       throw new Error('missing Kibana urls');
     }
   }
diff --git a/src/es_archiver/es_archiver.ts b/src/es_archiver/es_archiver.ts
index f36cbb3f516b9..e335652195b86 100644
--- a/src/es_archiver/es_archiver.ts
+++ b/src/es_archiver/es_archiver.ts
@@ -49,7 +49,7 @@ export class EsArchiver {
     this.client = client;
     this.dataDir = dataDir;
     this.log = log;
-    this.kbnClient = new KbnClient(log, [kibanaUrl]);
+    this.kbnClient = new KbnClient(log, { url: kibanaUrl });
   }
 
   /**

From ffae20bdaeb12d544f1e13ec9bd3784810418224 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Mon, 15 Jun 2020 14:46:24 +0200
Subject: [PATCH 10/24] adopt KibanaServer

---
 test/common/services/kibana_server/kibana_server.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/common/services/kibana_server/kibana_server.ts b/test/common/services/kibana_server/kibana_server.ts
index 16039d6fee833..4a251cca044d3 100644
--- a/test/common/services/kibana_server/kibana_server.ts
+++ b/test/common/services/kibana_server/kibana_server.ts
@@ -27,9 +27,9 @@ export function KibanaServerProvider({ getService }: FtrProviderContext) {
   const config = getService('config');
   const lifecycle = getService('lifecycle');
   const url = Url.format(config.get('servers.kibana'));
+  const ssl = config.get('servers.kibana').ssl;
   const defaults = config.get('uiSettings.defaults');
-
-  const kbn = new KbnClient(log, [url], defaults);
+  const kbn = new KbnClient(log, { url, ssl }, defaults);
 
   if (defaults) {
     lifecycle.beforeTests.add(async () => {

From efd92e1f9fb8e7c3a23c02c7fa29cf0dc772ce90 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Mon, 15 Jun 2020 14:47:22 +0200
Subject: [PATCH 11/24] use KbnRequester in security service

---
 .../src/kbn_client/kbn_client_requester.ts    |  8 ++---
 .../kbn_client/kbn_client_saved_objects.ts    | 16 ++++++---
 .../src/kbn_client/kbn_client_status.ts       |  3 +-
 .../src/kbn_client/kbn_client_ui_settings.ts  |  7 ++--
 test/common/services/security/role.ts         | 26 +++++++-------
 .../common/services/security/role_mappings.ts | 32 ++++++-----------
 test/common/services/security/security.ts     | 12 +++----
 test/common/services/security/user.ts         | 34 +++++++------------
 8 files changed, 61 insertions(+), 77 deletions(-)

diff --git a/packages/kbn-dev-utils/src/kbn_client/kbn_client_requester.ts b/packages/kbn-dev-utils/src/kbn_client/kbn_client_requester.ts
index f8cd85aff3bc0..98abf4517208b 100644
--- a/packages/kbn-dev-utils/src/kbn_client/kbn_client_requester.ts
+++ b/packages/kbn-dev-utils/src/kbn_client/kbn_client_requester.ts
@@ -18,7 +18,7 @@
  */
 import Url from 'url';
 import Https from 'https';
-import Axios from 'axios';
+import Axios, { AxiosResponse } from 'axios';
 
 import { isAxiosRequestError, isAxiosResponseError } from '../axios';
 import { ToolingLog } from '../tooling_log';
@@ -102,7 +102,7 @@ export class KbnClientRequester {
     return Url.resolve(this.pickUrl(), relativeUrl);
   }
 
-  async request<T>(options: ReqOptions): Promise<T> {
+  async request<T>(options: ReqOptions): Promise<AxiosResponse<T>> {
     const url = Url.resolve(this.pickUrl(), options.path);
     const description = options.description || `${options.method} ${url}`;
     let attempt = 0;
@@ -112,7 +112,7 @@ export class KbnClientRequester {
       attempt += 1;
 
       try {
-        const response = await Axios.request<T>({
+        const response = await Axios.request({
           method: options.method,
           url,
           data: options.body,
@@ -123,7 +123,7 @@ export class KbnClientRequester {
           httpsAgent: this.httpsAgent,
         });
 
-        return response.data;
+        return response;
       } catch (error) {
         const conflictOnGet = isConcliftOnGetError(error);
         const requestedRetries = options.retries !== undefined;
diff --git a/packages/kbn-dev-utils/src/kbn_client/kbn_client_saved_objects.ts b/packages/kbn-dev-utils/src/kbn_client/kbn_client_saved_objects.ts
index e671061b34352..7334c6353debf 100644
--- a/packages/kbn-dev-utils/src/kbn_client/kbn_client_saved_objects.ts
+++ b/packages/kbn-dev-utils/src/kbn_client/kbn_client_saved_objects.ts
@@ -71,12 +71,13 @@ export class KbnClientSavedObjects {
   public async migrate() {
     this.log.debug('Migrating saved objects');
 
-    return await this.requester.request<MigrateResponse>({
+    const { data } = await this.requester.request<MigrateResponse>({
       description: 'migrate saved objects',
       path: uriencode`/internal/saved_objects/_migrate`,
       method: 'POST',
       body: {},
     });
+    return data;
   }
 
   /**
@@ -85,11 +86,12 @@ export class KbnClientSavedObjects {
   public async get<Attributes extends Record<string, any>>(options: GetOptions) {
     this.log.debug('Gettings saved object: %j', options);
 
-    return await this.requester.request<SavedObjectResponse<Attributes>>({
+    const { data } = await this.requester.request<SavedObjectResponse<Attributes>>({
       description: 'get saved object',
       path: uriencode`/api/saved_objects/${options.type}/${options.id}`,
       method: 'GET',
     });
+    return data;
   }
 
   /**
@@ -98,7 +100,7 @@ export class KbnClientSavedObjects {
   public async create<Attributes extends Record<string, any>>(options: IndexOptions<Attributes>) {
     this.log.debug('Creating saved object: %j', options);
 
-    return await this.requester.request<SavedObjectResponse<Attributes>>({
+    const { data } = await this.requester.request<SavedObjectResponse<Attributes>>({
       description: 'update saved object',
       path: options.id
         ? uriencode`/api/saved_objects/${options.type}/${options.id}`
@@ -113,6 +115,7 @@ export class KbnClientSavedObjects {
         references: options.references,
       },
     });
+    return data;
   }
 
   /**
@@ -121,7 +124,7 @@ export class KbnClientSavedObjects {
   public async update<Attributes extends Record<string, any>>(options: UpdateOptions<Attributes>) {
     this.log.debug('Updating saved object: %j', options);
 
-    return await this.requester.request<SavedObjectResponse<Attributes>>({
+    const { data } = await this.requester.request<SavedObjectResponse<Attributes>>({
       description: 'update saved object',
       path: uriencode`/api/saved_objects/${options.type}/${options.id}`,
       query: {
@@ -134,6 +137,7 @@ export class KbnClientSavedObjects {
         references: options.references,
       },
     });
+    return data;
   }
 
   /**
@@ -142,10 +146,12 @@ export class KbnClientSavedObjects {
   public async delete(options: GetOptions) {
     this.log.debug('Deleting saved object %s/%s', options);
 
-    return await this.requester.request({
+    const { data } = await this.requester.request({
       description: 'delete saved object',
       path: uriencode`/api/saved_objects/${options.type}/${options.id}`,
       method: 'DELETE',
     });
+
+    return data;
   }
 }
diff --git a/packages/kbn-dev-utils/src/kbn_client/kbn_client_status.ts b/packages/kbn-dev-utils/src/kbn_client/kbn_client_status.ts
index 22baf4a330416..4f203e73620f3 100644
--- a/packages/kbn-dev-utils/src/kbn_client/kbn_client_status.ts
+++ b/packages/kbn-dev-utils/src/kbn_client/kbn_client_status.ts
@@ -52,10 +52,11 @@ export class KbnClientStatus {
    * Get the full server status
    */
   async get() {
-    return await this.requester.request<ApiResponseStatus>({
+    const { data } = await this.requester.request<ApiResponseStatus>({
       method: 'GET',
       path: 'api/status',
     });
+    return data;
   }
 
   /**
diff --git a/packages/kbn-dev-utils/src/kbn_client/kbn_client_ui_settings.ts b/packages/kbn-dev-utils/src/kbn_client/kbn_client_ui_settings.ts
index dbfa87e70032b..6ee2d3bfe59b0 100644
--- a/packages/kbn-dev-utils/src/kbn_client/kbn_client_ui_settings.ts
+++ b/packages/kbn-dev-utils/src/kbn_client/kbn_client_ui_settings.ts
@@ -57,10 +57,11 @@ export class KbnClientUiSettings {
    * Unset a uiSetting
    */
   async unset(setting: string) {
-    return await this.requester.request<any>({
+    const { data } = await this.requester.request<any>({
       path: uriencode`/api/kibana/settings/${setting}`,
       method: 'DELETE',
     });
+    return data;
   }
 
   /**
@@ -105,11 +106,11 @@ export class KbnClientUiSettings {
   }
 
   private async getAll() {
-    const resp = await this.requester.request<UiSettingsApiResponse>({
+    const { data } = await this.requester.request<UiSettingsApiResponse>({
       path: '/api/kibana/settings',
       method: 'GET',
     });
 
-    return resp.settings;
+    return data.settings;
   }
 }
diff --git a/test/common/services/security/role.ts b/test/common/services/security/role.ts
index dfc6ff9b164e5..b649ed18a4cbd 100644
--- a/test/common/services/security/role.ts
+++ b/test/common/services/security/role.ts
@@ -17,27 +17,22 @@
  * under the License.
  */
 
-import axios, { AxiosInstance } from 'axios';
 import util from 'util';
-import { ToolingLog } from '@kbn/dev-utils';
+import { KbnClient, ToolingLog } from '@kbn/dev-utils';
 
 export class Role {
-  private log: ToolingLog;
-  private axios: AxiosInstance;
-
-  constructor(url: string, log: ToolingLog) {
+  constructor(private log: ToolingLog, private kibanaServer: KbnClient) {
     this.log = log;
-    this.axios = axios.create({
-      headers: { 'kbn-xsrf': 'x-pack/ftr/services/security/role' },
-      baseURL: url,
-      maxRedirects: 0,
-      validateStatus: () => true, // we do our own validation below and throw better error messages
-    });
   }
 
   public async create(name: string, role: any) {
     this.log.debug(`creating role ${name}`);
-    const { data, status, statusText } = await this.axios.put(`/api/security/role/${name}`, role);
+    const { data, status, statusText } = await this.kibanaServer.request({
+      path: `/api/security/role/${name}`,
+      method: 'PUT',
+      body: role,
+      retries: 0,
+    });
     if (status !== 204) {
       throw new Error(
         `Expected status code of 204, received ${status} ${statusText}: ${util.inspect(data)}`
@@ -47,7 +42,10 @@ export class Role {
 
   public async delete(name: string) {
     this.log.debug(`deleting role ${name}`);
-    const { data, status, statusText } = await this.axios.delete(`/api/security/role/${name}`);
+    const { data, status, statusText } = await this.kibanaServer.request({
+      path: `/api/security/role/${name}`,
+      method: 'DELETE',
+    });
     if (status !== 204 && status !== 404) {
       throw new Error(
         `Expected status code of 204 or 404, received ${status} ${statusText}: ${util.inspect(
diff --git a/test/common/services/security/role_mappings.ts b/test/common/services/security/role_mappings.ts
index cc2fa23825498..7951d4b5b47b2 100644
--- a/test/common/services/security/role_mappings.ts
+++ b/test/common/services/security/role_mappings.ts
@@ -17,30 +17,19 @@
  * under the License.
  */
 
-import axios, { AxiosInstance } from 'axios';
 import util from 'util';
-import { ToolingLog } from '@kbn/dev-utils';
+import { KbnClient, ToolingLog } from '@kbn/dev-utils';
 
 export class RoleMappings {
-  private log: ToolingLog;
-  private axios: AxiosInstance;
-
-  constructor(url: string, log: ToolingLog) {
-    this.log = log;
-    this.axios = axios.create({
-      headers: { 'kbn-xsrf': 'x-pack/ftr/services/security/role_mappings' },
-      baseURL: url,
-      maxRedirects: 0,
-      validateStatus: () => true, // we do our own validation below and throw better error messages
-    });
-  }
+  constructor(private log: ToolingLog, private kbnClient: KbnClient) {}
 
   public async create(name: string, roleMapping: Record<string, any>) {
     this.log.debug(`creating role mapping ${name}`);
-    const { data, status, statusText } = await this.axios.post(
-      `/internal/security/role_mapping/${name}`,
-      roleMapping
-    );
+    const { data, status, statusText } = await this.kbnClient.request({
+      path: `/internal/security/role_mapping/${name}`,
+      method: 'POST',
+      body: roleMapping,
+    });
     if (status !== 200) {
       throw new Error(
         `Expected status code of 200, received ${status} ${statusText}: ${util.inspect(data)}`
@@ -51,9 +40,10 @@ export class RoleMappings {
 
   public async delete(name: string) {
     this.log.debug(`deleting role mapping ${name}`);
-    const { data, status, statusText } = await this.axios.delete(
-      `/internal/security/role_mapping/${name}`
-    );
+    const { data, status, statusText } = await this.kbnClient.request({
+      path: `/internal/security/role_mapping/${name}`,
+      method: 'DELETE',
+    });
     if (status !== 200 && status !== 404) {
       throw new Error(
         `Expected status code of 200 or 404, received ${status} ${statusText}: ${util.inspect(
diff --git a/test/common/services/security/security.ts b/test/common/services/security/security.ts
index 6ad0933a2a5a2..fae4c9198cab6 100644
--- a/test/common/services/security/security.ts
+++ b/test/common/services/security/security.ts
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-import { format as formatUrl } from 'url';
-
 import { Role } from './role';
 import { User } from './user';
 import { RoleMappings } from './role_mappings';
@@ -28,14 +26,14 @@ import { createTestUserService } from './test_user';
 export async function SecurityServiceProvider(context: FtrProviderContext) {
   const { getService } = context;
   const log = getService('log');
-  const config = getService('config');
-  const url = formatUrl(config.get('servers.kibana'));
-  const role = new Role(url, log);
-  const user = new User(url, log);
+  const kibanaServer = getService('kibanaServer');
+
+  const role = new Role(log, kibanaServer);
+  const user = new User(log, kibanaServer);
   const testUser = await createTestUserService(role, user, context);
 
   return new (class SecurityService {
-    roleMappings = new RoleMappings(url, log);
+    roleMappings = new RoleMappings(log, kibanaServer);
     testUser = testUser;
     role = role;
     user = user;
diff --git a/test/common/services/security/user.ts b/test/common/services/security/user.ts
index ae02127043234..58c4d0f1cf34e 100644
--- a/test/common/services/security/user.ts
+++ b/test/common/services/security/user.ts
@@ -17,33 +17,22 @@
  * under the License.
  */
 
-import axios, { AxiosInstance } from 'axios';
 import util from 'util';
-import { ToolingLog } from '@kbn/dev-utils';
+import { KbnClient, ToolingLog } from '@kbn/dev-utils';
 
 export class User {
-  private log: ToolingLog;
-  private axios: AxiosInstance;
-
-  constructor(url: string, log: ToolingLog) {
-    this.log = log;
-    this.axios = axios.create({
-      headers: { 'kbn-xsrf': 'x-pack/ftr/services/security/user' },
-      baseURL: url,
-      maxRedirects: 0,
-      validateStatus: () => true, // we do our own validation below and throw better error messages
-    });
-  }
+  constructor(private log: ToolingLog, private kbnClient: KbnClient) {}
 
   public async create(username: string, user: any) {
     this.log.debug(`creating user ${username}`);
-    const { data, status, statusText } = await this.axios.post(
-      `/internal/security/users/${username}`,
-      {
+    const { data, status, statusText } = await this.kbnClient.request({
+      path: `/internal/security/users/${username}`,
+      method: 'POST',
+      body: {
         username,
         ...user,
-      }
-    );
+      },
+    });
     if (status !== 200) {
       throw new Error(
         `Expected status code of 200, received ${status} ${statusText}: ${util.inspect(data)}`
@@ -54,9 +43,10 @@ export class User {
 
   public async delete(username: string) {
     this.log.debug(`deleting user ${username}`);
-    const { data, status, statusText } = await this.axios.delete(
-      `/internal/security/users/${username}`
-    );
+    const { data, status, statusText } = await await this.kbnClient.request({
+      path: `/internal/security/users/${username}`,
+      method: 'DELETE',
+    });
     if (status !== 204) {
       throw new Error(
         `Expected status code of 204, received ${status} ${statusText}: ${util.inspect(data)}`

From 31748d6f0122593f6a7305e035a6d56f7b8d549c Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Mon, 15 Jun 2020 14:47:53 +0200
Subject: [PATCH 12/24] set sameSiteCookies:None in test

---
 x-pack/test/functional_embedded/config.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/test/functional_embedded/config.ts b/x-pack/test/functional_embedded/config.ts
index 9818f40d323b9..8c9209cc21d52 100644
--- a/x-pack/test/functional_embedded/config.ts
+++ b/x-pack/test/functional_embedded/config.ts
@@ -54,9 +54,9 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
         '--server.ssl.enabled=true',
         `--server.ssl.key=${KBN_KEY_PATH}`,
         `--server.ssl.certificate=${KBN_CERT_PATH}`,
-        `--server.ssl.certificateAuthorities=${JSON.stringify([CA_CERT_PATH])}`,
+        `--server.ssl.certificateAuthorities=${CA_CERT_PATH}`,
 
-        // '--xpack.security.sameSiteCookies=None',
+        '--xpack.security.sameSiteCookies=None',
         '--xpack.security.secureCookies=true',
       ],
     },

From 171508b3212c69139de2c809ad55cdaaf031cb15 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Mon, 15 Jun 2020 14:56:21 +0200
Subject: [PATCH 13/24] acceptInsecureCerts in chrome

---
 test/functional/services/remote/webdriver.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/functional/services/remote/webdriver.ts b/test/functional/services/remote/webdriver.ts
index 9fbbf28bbf42c..aec353a66341a 100644
--- a/test/functional/services/remote/webdriver.ts
+++ b/test/functional/services/remote/webdriver.ts
@@ -125,6 +125,7 @@ async function attemptToCreateCommand(
         });
         chromeCapabilities.set('unexpectedAlertBehaviour', 'accept');
         chromeCapabilities.set('goog:loggingPrefs', { browser: 'ALL' });
+        chromeCapabilities.set('acceptInsecureCerts', true);
 
         const session = await new Builder()
           .forBrowser(browserType)

From 812955c79e5f34c7ecf21a0139303c8581d61711 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Mon, 15 Jun 2020 15:01:23 +0200
Subject: [PATCH 14/24] remove leftovers

---
 packages/kbn-test/src/functional_test_runner/cli.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/kbn-test/src/functional_test_runner/cli.ts b/packages/kbn-test/src/functional_test_runner/cli.ts
index ed139cffff771..fd5ee5ad3ae44 100644
--- a/packages/kbn-test/src/functional_test_runner/cli.ts
+++ b/packages/kbn-test/src/functional_test_runner/cli.ts
@@ -140,7 +140,6 @@ export function runFtrCli() {
         --kibana-install-dir  directory where the Kibana install being tested resides
         --throttle         enable network throttling in Chrome browser
         --headless         run browser in headless mode
-        --ignore-tls-errors ignore self-signed cert errors
       `,
       },
     }

From 00d6b01a6b9f1c25b4d5891108553bf316b649aa Mon Sep 17 00:00:00 2001
From: restrry <restrry@gmail.com>
Date: Mon, 15 Jun 2020 16:42:37 +0200
Subject: [PATCH 15/24] fix type error

---
 .../src/kbn_client/kbn_client_requester.ts         | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/kbn-dev-utils/src/kbn_client/kbn_client_requester.ts b/packages/kbn-dev-utils/src/kbn_client/kbn_client_requester.ts
index 98abf4517208b..2aba2be56f277 100644
--- a/packages/kbn-dev-utils/src/kbn_client/kbn_client_requester.ts
+++ b/packages/kbn-dev-utils/src/kbn_client/kbn_client_requester.ts
@@ -71,14 +71,12 @@ const delay = (ms: number) =>
 
 export interface KibanaConfig {
   url: string;
-  ssl:
-    | undefined
-    | {
-        enabled: boolean;
-        key: string;
-        certificate: string;
-        certificateAuthorities: string;
-      };
+  ssl?: {
+    enabled: boolean;
+    key: string;
+    certificate: string;
+    certificateAuthorities: string;
+  };
 }
 
 export class KbnClientRequester {

From 690052c963e53e7269c136d9d12b56c593794f47 Mon Sep 17 00:00:00 2001
From: restrry <restrry@gmail.com>
Date: Mon, 15 Jun 2020 16:53:39 +0200
Subject: [PATCH 16/24] remove unnecessary field

---
 .../functional_embedded/plugins/iframe_embedded/package.json     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/x-pack/test/functional_embedded/plugins/iframe_embedded/package.json b/x-pack/test/functional_embedded/plugins/iframe_embedded/package.json
index 11ddde91459a4..96c07ed1d14df 100644
--- a/x-pack/test/functional_embedded/plugins/iframe_embedded/package.json
+++ b/x-pack/test/functional_embedded/plugins/iframe_embedded/package.json
@@ -4,7 +4,6 @@
   "kibana": {
     "version": "kibana"
   },
-  "main": "target/test/plugin_api_integration/plugins/event_log",
   "scripts": {
     "kbn": "node ../../../../../scripts/kbn.js",
     "build": "rm -rf './target' && tsc"

From 42b4ce48e966f5a4830f1766bbfaa458b9e676fe Mon Sep 17 00:00:00 2001
From: restrry <restrry@gmail.com>
Date: Tue, 16 Jun 2020 09:33:59 +0200
Subject: [PATCH 17/24] address comments

---
 packages/kbn-test/src/kbn/kbn_test_config.ts  | 26 +++++++++----------
 test/common/services/security/role.ts         |  4 +--
 test/functional/services/common/browser.ts    |  5 ++++
 .../tests/iframe_embedded.ts                  | 10 ++-----
 .../test/functional_embedded/tests/index.ts   |  2 +-
 5 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/packages/kbn-test/src/kbn/kbn_test_config.ts b/packages/kbn-test/src/kbn/kbn_test_config.ts
index 3c96086920941..909c94098cf5d 100644
--- a/packages/kbn-test/src/kbn/kbn_test_config.ts
+++ b/packages/kbn-test/src/kbn/kbn_test_config.ts
@@ -20,12 +20,12 @@ import url from 'url';
 import { kibanaTestUser } from './users';
 
 interface UrlParts {
-  protocol: string;
-  hostname: string;
-  port: number;
-  auth: string;
-  username: string;
-  password: string;
+  protocol?: string;
+  hostname?: string;
+  port?: number;
+  auth?: string;
+  username?: string;
+  password?: string;
 }
 
 export const kbnTestConfig = new (class KbnTestConfig {
@@ -38,12 +38,12 @@ export const kbnTestConfig = new (class KbnTestConfig {
     if (process.env.TEST_KIBANA_URL) {
       const testKibanaUrl = url.parse(process.env.TEST_KIBANA_URL);
       return {
-        protocol: testKibanaUrl.protocol!.slice(0, -1),
-        hostname: testKibanaUrl.hostname!,
-        port: parseInt(testKibanaUrl.port!, 10),
-        auth: testKibanaUrl.auth!,
-        username: testKibanaUrl.auth!.split(':')[0],
-        password: testKibanaUrl.auth!.split(':')[1],
+        protocol: testKibanaUrl.protocol?.slice(0, -1),
+        hostname: testKibanaUrl.hostname,
+        port: testKibanaUrl.port ? parseInt(testKibanaUrl.port, 10) : undefined,
+        auth: testKibanaUrl.auth,
+        username: testKibanaUrl.auth?.split(':')[0],
+        password: testKibanaUrl.auth?.split(':')[1],
       };
     }
 
@@ -52,7 +52,7 @@ export const kbnTestConfig = new (class KbnTestConfig {
     return {
       protocol: process.env.TEST_KIBANA_PROTOCOL || 'http',
       hostname: process.env.TEST_KIBANA_HOSTNAME || 'localhost',
-      port: parseInt(process.env.TEST_KIBANA_PORT!, 10) || 5620,
+      port: process.env.TEST_KIBANA_PORT ? parseInt(process.env.TEST_KIBANA_PORT, 10) : 5620,
       auth: `${username}:${password}`,
       username,
       password,
diff --git a/test/common/services/security/role.ts b/test/common/services/security/role.ts
index b649ed18a4cbd..caa5549a70f0c 100644
--- a/test/common/services/security/role.ts
+++ b/test/common/services/security/role.ts
@@ -21,9 +21,7 @@ import util from 'util';
 import { KbnClient, ToolingLog } from '@kbn/dev-utils';
 
 export class Role {
-  constructor(private log: ToolingLog, private kibanaServer: KbnClient) {
-    this.log = log;
-  }
+  constructor(private log: ToolingLog, private kibanaServer: KbnClient) {}
 
   public async create(name: string, role: any) {
     this.log.debug(`creating role ${name}`);
diff --git a/test/functional/services/common/browser.ts b/test/functional/services/common/browser.ts
index 3297f6e094f7c..d6a4fc91481de 100644
--- a/test/functional/services/common/browser.ts
+++ b/test/functional/services/common/browser.ts
@@ -529,5 +529,10 @@ export async function BrowserProvider({ getService }: FtrProviderContext) {
       await driver.executeScript('document.body.scrollLeft = ' + scrollSize);
       return this.getScrollLeft();
     }
+
+    public async switchToFrame(idOrElement: number | WebElementWrapper) {
+      const _id = idOrElement instanceof WebElementWrapper ? idOrElement._webElement : idOrElement;
+      await driver.switchTo().frame(_id);
+    }
   })();
 }
diff --git a/x-pack/test/functional_embedded/tests/iframe_embedded.ts b/x-pack/test/functional_embedded/tests/iframe_embedded.ts
index f7cc6722b0247..f9f395b75f692 100644
--- a/x-pack/test/functional_embedded/tests/iframe_embedded.ts
+++ b/x-pack/test/functional_embedded/tests/iframe_embedded.ts
@@ -4,8 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import Url from 'url';
-import { By, until } from 'selenium-webdriver';
-import testSubjSelector from '@kbn/test-subj-selector';
 
 import { FtrProviderContext } from '../ftr_provider_context';
 
@@ -15,8 +13,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const config = getService('config');
   const testSubjects = getService('testSubjects');
 
-  const WD = getService('__webdriver__');
-
   describe('in iframe', () => {
     it('should open Kibana for logged-in user', async () => {
       await PageObjects.security.login();
@@ -33,11 +29,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await browser.navigateTo(url);
 
       const iframe = await testSubjects.find('iframe_embedded');
-      WD.driver.switchTo().frame(iframe._webElement);
+      await browser.switchToFrame(iframe);
 
-      const selector = By.css(testSubjSelector('kibanaChrome'));
-      const minute = 60000;
-      await WD.driver.wait(until.elementLocated(selector), minute);
+      await testSubjects.find('kibanaChrome', 60000);
     });
   });
 }
diff --git a/x-pack/test/functional_embedded/tests/index.ts b/x-pack/test/functional_embedded/tests/index.ts
index 5e0837cb4958e..87ac00b242437 100644
--- a/x-pack/test/functional_embedded/tests/index.ts
+++ b/x-pack/test/functional_embedded/tests/index.ts
@@ -8,7 +8,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('Kibana embedded', function () {
-    this.tags('ciGroup6');
+    this.tags('ciGroup2');
     loadTestFile(require.resolve('./iframe_embedded'));
   });
 }

From 6fcf3e31a8aff2ae01a50666ab451fe907a11e4e Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Wed, 17 Jun 2020 11:03:06 +0200
Subject: [PATCH 18/24] refactor plugin

---
 .../plugins/iframe_embedded/server/plugin.ts     | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts b/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts
index 3dba3737222d7..890fe14cf03cf 100644
--- a/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts
+++ b/x-pack/test/functional_embedded/plugins/iframe_embedded/server/plugin.ts
@@ -5,9 +5,8 @@
  */
 import Url from 'url';
 import { Plugin, CoreSetup, PluginInitializerContext } from 'src/core/server';
-import { kbnTestConfig } from '@kbn/test';
 
-function renderBody(iframeUrl: string = 'https://localhost:5601') {
+function renderBody(iframeUrl: string) {
   return `
 <!DOCTYPE html>
 <html>
@@ -25,21 +24,18 @@ export class IframeEmbeddedPlugin implements Plugin {
   constructor(initializerContext: PluginInitializerContext) {}
 
   public setup(core: CoreSetup) {
-    const router = core.http.createRouter();
-    router.get(
+    core.http.resources.register(
       {
         path: '/iframe_embedded',
         validate: false,
       },
       async (context, request, response) => {
-        const { hostname, port } = kbnTestConfig.getUrlParts();
-        const kibanaUrl = Url.format({ protocol: 'https', hostname, port });
+        const { protocol, port, host } = core.http.getServerInfo();
 
-        return response.ok({
+        const kibanaUrl = Url.format({ protocol, hostname: host, port });
+
+        return response.renderHtml({
           body: renderBody(kibanaUrl),
-          headers: {
-            'content-type': 'text/html',
-          },
         });
       }
     );

From ff6ff1d842a2e893ae2fad98afe02c8874a17cda Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Wed, 17 Jun 2020 11:03:42 +0200
Subject: [PATCH 19/24] refactor test

---
 x-pack/test/functional_embedded/tests/iframe_embedded.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/x-pack/test/functional_embedded/tests/iframe_embedded.ts b/x-pack/test/functional_embedded/tests/iframe_embedded.ts
index f9f395b75f692..9b5c9894a9407 100644
--- a/x-pack/test/functional_embedded/tests/iframe_embedded.ts
+++ b/x-pack/test/functional_embedded/tests/iframe_embedded.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import Url from 'url';
+import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../ftr_provider_context';
 
@@ -15,6 +16,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('in iframe', () => {
     it('should open Kibana for logged-in user', async () => {
+      const isChromeHiddenBefore = await PageObjects.common.isChromeHidden();
+      expect(isChromeHiddenBefore).to.be(true);
+
       await PageObjects.security.login();
 
       const { protocol, hostname, port } = config.get('servers.kibana');
@@ -31,7 +35,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       const iframe = await testSubjects.find('iframe_embedded');
       await browser.switchToFrame(iframe);
 
-      await testSubjects.find('kibanaChrome', 60000);
+      const isChromeHidden = await PageObjects.common.isChromeHidden();
+      expect(isChromeHidden).to.be(false);
     });
   });
 }

From cb27f351f0da8e70fe95a0a4a9bacafc4259aeb8 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Wed, 17 Jun 2020 11:41:05 +0200
Subject: [PATCH 20/24] make acceptInsecureCerts configurable

---
 .../lib/config/schema.ts                      |  1 +
 test/functional/services/remote/remote.ts     | 14 +++++++-------
 test/functional/services/remote/webdriver.ts  | 19 +++++++++++++------
 x-pack/test/functional_embedded/config.ts     |  3 +++
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts b/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts
index 1ed68bd514daa..e9aeee87f1a3b 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts
@@ -130,6 +130,7 @@ export const schema = Joi.object()
         type: Joi.string().valid('chrome', 'firefox', 'ie', 'msedge').default('chrome'),
 
         logPollingMs: Joi.number().default(100),
+        acceptInsecureCerts: Joi.boolean().default(false),
       })
       .default(),
 
diff --git a/test/functional/services/remote/remote.ts b/test/functional/services/remote/remote.ts
index 5a3a775cae0c5..99643929c4682 100644
--- a/test/functional/services/remote/remote.ts
+++ b/test/functional/services/remote/remote.ts
@@ -23,7 +23,7 @@ import { resolve } from 'path';
 import { mergeMap } from 'rxjs/operators';
 
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { initWebDriver } from './webdriver';
+import { initWebDriver, BrowserConfig } from './webdriver';
 import { Browsers } from './browsers';
 
 export async function RemoteProvider({ getService }: FtrProviderContext) {
@@ -58,12 +58,12 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
     Fs.writeFileSync(path, JSON.stringify(JSON.parse(coverageJson), null, 2));
   };
 
-  const { driver, consoleLog$ } = await initWebDriver(
-    log,
-    browserType,
-    lifecycle,
-    config.get('browser.logPollingMs')
-  );
+  const browserConfig: BrowserConfig = {
+    logPollingMs: config.get('browser.logPollingMs'),
+    acceptInsecureCerts: config.get('browser.acceptInsecureCerts'),
+  };
+
+  const { driver, consoleLog$ } = await initWebDriver(log, browserType, lifecycle, browserConfig);
   const isW3CEnabled = (driver as any).executor_.w3c;
 
   const caps = await driver.getCapabilities();
diff --git a/test/functional/services/remote/webdriver.ts b/test/functional/services/remote/webdriver.ts
index aec353a66341a..27814060e70c1 100644
--- a/test/functional/services/remote/webdriver.ts
+++ b/test/functional/services/remote/webdriver.ts
@@ -73,13 +73,18 @@ Executor.prototype.execute = preventParallelCalls(
   (command: { getName: () => string }) => NO_QUEUE_COMMANDS.includes(command.getName())
 );
 
+export interface BrowserConfig {
+  logPollingMs: number;
+  acceptInsecureCerts: boolean;
+}
+
 let attemptCounter = 0;
 let edgePaths: { driverPath: string | undefined; browserPath: string | undefined };
 async function attemptToCreateCommand(
   log: ToolingLog,
   browserType: Browsers,
   lifecycle: Lifecycle,
-  logPollingMs: number
+  config: BrowserConfig
 ) {
   const attemptId = ++attemptCounter;
   log.debug('[webdriver] Creating session');
@@ -114,6 +119,7 @@ async function attemptToCreateCommand(
         if (certValidation === '0') {
           chromeOptions.push('ignore-certificate-errors');
         }
+
         if (remoteDebug === '1') {
           // Visit chrome://inspect in chrome to remotely view/debug
           chromeOptions.push('headless', 'disable-gpu', 'remote-debugging-port=9222');
@@ -125,7 +131,7 @@ async function attemptToCreateCommand(
         });
         chromeCapabilities.set('unexpectedAlertBehaviour', 'accept');
         chromeCapabilities.set('goog:loggingPrefs', { browser: 'ALL' });
-        chromeCapabilities.set('acceptInsecureCerts', true);
+        chromeCapabilities.setAcceptInsecureCerts(config.acceptInsecureCerts);
 
         const session = await new Builder()
           .forBrowser(browserType)
@@ -138,7 +144,7 @@ async function attemptToCreateCommand(
           consoleLog$: pollForLogEntry$(
             session,
             logging.Type.BROWSER,
-            logPollingMs,
+            config.logPollingMs,
             lifecycle.cleanup.after$
           ).pipe(
             takeUntil(lifecycle.cleanup.after$),
@@ -175,7 +181,7 @@ async function attemptToCreateCommand(
             consoleLog$: pollForLogEntry$(
               session,
               logging.Type.BROWSER,
-              logPollingMs,
+              config.logPollingMs,
               lifecycle.cleanup.after$
             ).pipe(
               takeUntil(lifecycle.cleanup.after$),
@@ -207,6 +213,7 @@ async function attemptToCreateCommand(
           'browser.helperApps.neverAsk.saveToDisk',
           'application/comma-separated-values, text/csv, text/plain'
         );
+        firefoxOptions.setAcceptInsecureCerts(config.acceptInsecureCerts);
 
         if (headlessBrowser === '1') {
           // See: https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Headless_mode
@@ -318,7 +325,7 @@ export async function initWebDriver(
   log: ToolingLog,
   browserType: Browsers,
   lifecycle: Lifecycle,
-  logPollingMs: number
+  config: BrowserConfig
 ) {
   const logger = getLogger('webdriver.http.Executor');
   logger.setLevel(logging.Level.FINEST);
@@ -349,7 +356,7 @@ export async function initWebDriver(
       while (true) {
         const command = await Promise.race([
           delay(30 * SECOND),
-          attemptToCreateCommand(log, browserType, lifecycle, logPollingMs),
+          attemptToCreateCommand(log, browserType, lifecycle, config),
         ]);
 
         if (!command) {
diff --git a/x-pack/test/functional_embedded/config.ts b/x-pack/test/functional_embedded/config.ts
index 8c9209cc21d52..95b290ece7db2 100644
--- a/x-pack/test/functional_embedded/config.ts
+++ b/x-pack/test/functional_embedded/config.ts
@@ -37,6 +37,9 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     servers,
     services: kibanaFunctionalConfig.get('services'),
     pageObjects,
+    browser: {
+      acceptInsecureCerts: true,
+    },
     junit: {
       reportName: 'Kibana Embedded in iframe with X-Pack Security',
     },

From 8edf4ab2a719e86e784a986105eaf3cff905b4b0 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Wed, 17 Jun 2020 11:41:36 +0200
Subject: [PATCH 21/24] run firefox tests on ci

---
 test/scripts/jenkins_xpack_firefox_smoke.sh   |  1 +
 .../functional_embedded/config.firefox.ts     | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 x-pack/test/functional_embedded/config.firefox.ts

diff --git a/test/scripts/jenkins_xpack_firefox_smoke.sh b/test/scripts/jenkins_xpack_firefox_smoke.sh
index fdaee76cafa9d..1db047a22eeda 100755
--- a/test/scripts/jenkins_xpack_firefox_smoke.sh
+++ b/test/scripts/jenkins_xpack_firefox_smoke.sh
@@ -8,3 +8,4 @@ checks-reporter-with-killswitch "X-Pack firefox smoke test" \
     --kibana-install-dir "$KIBANA_INSTALL_DIR" \
     --include-tag "includeFirefox" \
     --config test/functional/config.firefox.js;
+    --config x-pack/test/functional_embedded/config.firefox.ts;
diff --git a/x-pack/test/functional_embedded/config.firefox.ts b/x-pack/test/functional_embedded/config.firefox.ts
new file mode 100644
index 0000000000000..2051d1afd4ab3
--- /dev/null
+++ b/x-pack/test/functional_embedded/config.firefox.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const chromeConfig = await readConfigFile(require.resolve('./config'));
+
+  return {
+    ...chromeConfig.getAll(),
+
+    browser: {
+      type: 'firefox',
+      acceptInsecureCerts: true,
+    },
+
+    suiteTags: {
+      exclude: ['skipFirefox'],
+    },
+
+    junit: {
+      reportName: 'Firefox Kibana Embedded in iframe with X-Pack Security',
+    },
+  };
+}

From 89bc3d82a176f609679d9d5d65fe772120f8b8b4 Mon Sep 17 00:00:00 2001
From: restrry <restrry@gmail.com>
Date: Wed, 17 Jun 2020 11:46:45 +0200
Subject: [PATCH 22/24] up TS version

---
 .../functional_embedded/plugins/iframe_embedded/package.json    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/test/functional_embedded/plugins/iframe_embedded/package.json b/x-pack/test/functional_embedded/plugins/iframe_embedded/package.json
index 96c07ed1d14df..9fa1554e5312b 100644
--- a/x-pack/test/functional_embedded/plugins/iframe_embedded/package.json
+++ b/x-pack/test/functional_embedded/plugins/iframe_embedded/package.json
@@ -9,6 +9,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.7.2"
+    "typescript": "3.9.5"
   }
 }

From 29021dbae956d8f06ccff4b4a58fd1a7d673139f Mon Sep 17 00:00:00 2001
From: restrry <restrry@gmail.com>
Date: Wed, 17 Jun 2020 16:32:49 +0200
Subject: [PATCH 23/24] fix firefox.sh script

---
 test/scripts/jenkins_xpack_firefox_smoke.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/scripts/jenkins_xpack_firefox_smoke.sh b/test/scripts/jenkins_xpack_firefox_smoke.sh
index 1db047a22eeda..88d3994bc1bef 100755
--- a/test/scripts/jenkins_xpack_firefox_smoke.sh
+++ b/test/scripts/jenkins_xpack_firefox_smoke.sh
@@ -7,5 +7,5 @@ checks-reporter-with-killswitch "X-Pack firefox smoke test" \
     --debug --bail \
     --kibana-install-dir "$KIBANA_INSTALL_DIR" \
     --include-tag "includeFirefox" \
-    --config test/functional/config.firefox.js;
+    --config test/functional/config.firefox.js \
     --config x-pack/test/functional_embedded/config.firefox.ts;

From f53a83a3b61f32fa54eb4f892387ff53a0607379 Mon Sep 17 00:00:00 2001
From: restrry <restrry@gmail.com>
Date: Wed, 17 Jun 2020 19:01:52 +0200
Subject: [PATCH 24/24] fix path

---
 test/scripts/jenkins_xpack_firefox_smoke.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/scripts/jenkins_xpack_firefox_smoke.sh b/test/scripts/jenkins_xpack_firefox_smoke.sh
index 88d3994bc1bef..ae924a5e10552 100755
--- a/test/scripts/jenkins_xpack_firefox_smoke.sh
+++ b/test/scripts/jenkins_xpack_firefox_smoke.sh
@@ -8,4 +8,4 @@ checks-reporter-with-killswitch "X-Pack firefox smoke test" \
     --kibana-install-dir "$KIBANA_INSTALL_DIR" \
     --include-tag "includeFirefox" \
     --config test/functional/config.firefox.js \
-    --config x-pack/test/functional_embedded/config.firefox.ts;
+    --config test/functional_embedded/config.firefox.ts;