[8.6] [Synthetics] Omit or include ssl keys when appropriate for pr…

…oject monitors and private locations (#149298) (#149447) # Backport This will backport the following commits from `main` to `8.6`: - [[Synthetics] Omit or include `ssl` keys when appropriate for project monitors and private locations (#149298)](#149298)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: kibanamachine <[email protected]>
elastic · Jan 25, 2023 · 22383ac · 22383ac
1 parent e62d092
commit 22383ac
Show file tree

Hide file tree

Showing 15 changed files with 1,841 additions and 59 deletions.
diff --git a/x-pack/plugins/synthetics/common/formatters/format_synthetics_policy.test.ts b/x-pack/plugins/synthetics/common/formatters/format_synthetics_policy.test.ts
diff --git a/x-pack/plugins/synthetics/common/formatters/tls/formatters.ts b/x-pack/plugins/synthetics/common/formatters/tls/formatters.ts
@@ -4,29 +4,43 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { TLSFields, ConfigKey } from '../../runtime_types/monitor_management';
+import { TLSFields, TLSVersion, ConfigKey } from '../../runtime_types/monitor_management';
 import { Formatter } from '../common/formatters';
 
 type TLSFormatMap = Record<keyof TLSFields, Formatter>;
 
 export const tlsFormatters: TLSFormatMap = {
   [ConfigKey.TLS_CERTIFICATE_AUTHORITIES]: (fields) =>
-    tlsValueToYamlFormatter(fields[ConfigKey.TLS_CERTIFICATE_AUTHORITIES]),
+    fields[ConfigKey.METADATA]?.is_tls_enabled
+      ? tlsValueToYamlFormatter(fields[ConfigKey.TLS_CERTIFICATE_AUTHORITIES])
+      : null,
   [ConfigKey.TLS_CERTIFICATE]: (fields) =>
-    tlsValueToYamlFormatter(fields[ConfigKey.TLS_CERTIFICATE]),
-  [ConfigKey.TLS_KEY]: (fields) => tlsValueToYamlFormatter(fields[ConfigKey.TLS_KEY]),
+    fields[ConfigKey.METADATA]?.is_tls_enabled
+      ? tlsValueToYamlFormatter(fields[ConfigKey.TLS_CERTIFICATE])
+      : null,
+  [ConfigKey.TLS_KEY]: (fields) =>
+    fields[ConfigKey.METADATA]?.is_tls_enabled
+      ? tlsValueToYamlFormatter(fields[ConfigKey.TLS_KEY])
+      : null,
   [ConfigKey.TLS_KEY_PASSPHRASE]: (fields) =>
-    tlsValueToStringFormatter(fields[ConfigKey.TLS_KEY_PASSPHRASE]),
+    fields[ConfigKey.METADATA]?.is_tls_enabled
+      ? tlsValueToStringFormatter(fields[ConfigKey.TLS_KEY_PASSPHRASE])
+      : null,
   [ConfigKey.TLS_VERIFICATION_MODE]: (fields) =>
-    tlsValueToStringFormatter(fields[ConfigKey.TLS_VERIFICATION_MODE]),
-  [ConfigKey.TLS_VERSION]: (fields) => tlsArrayToYamlFormatter(fields[ConfigKey.TLS_VERSION]),
+    fields[ConfigKey.METADATA]?.is_tls_enabled
+      ? tlsValueToStringFormatter(fields[ConfigKey.TLS_VERIFICATION_MODE])
+      : null,
+  [ConfigKey.TLS_VERSION]: (fields) =>
+    fields[ConfigKey.METADATA]?.is_tls_enabled
+      ? tlsArrayToYamlFormatter(fields[ConfigKey.TLS_VERSION])
+      : null,
 };
 
 // only add tls settings if they are enabled by the user and isEnabled is true
-export const tlsValueToYamlFormatter = (tlsValue: string = '') =>
+export const tlsValueToYamlFormatter = (tlsValue: string | null = '') =>
   tlsValue ? JSON.stringify(tlsValue) : null;
 
-export const tlsValueToStringFormatter = (tlsValue: string = '') => tlsValue || null;
+export const tlsValueToStringFormatter = (tlsValue: string | null = '') => tlsValue || null;
 
-export const tlsArrayToYamlFormatter = (tlsValue: string[] = []) =>
-  tlsValue.length ? JSON.stringify(tlsValue) : null;
+export const tlsArrayToYamlFormatter = (tlsValue: TLSVersion[] | null = []) =>
+  tlsValue?.length ? JSON.stringify(tlsValue) : null;
diff --git a/...synthetics/public/legacy_uptime/components/fleet_package/hooks/use_update_policy.test.tsx b/...synthetics/public/legacy_uptime/components/fleet_package/hooks/use_update_policy.test.tsx
@@ -23,7 +23,7 @@ import {
 } from '../types';
 import { defaultConfig } from '../synthetics_policy_create_extension';
 
-describe('useBarChartsHooks', () => {
+describe('useUpdatePolicy', () => {
   const newPolicy: NewPackagePolicy = {
     name: '',
     description: '',
@@ -433,6 +433,9 @@ describe('useBarChartsHooks', () => {
       ...initialProps,
       config: {
         ...defaultConfig[DataStream.HTTP],
+        [ConfigKey.METADATA]: {
+          is_tls_enabled: true,
+        },
         [ConfigKey.RESPONSE_BODY_CHECK_POSITIVE]: ['test'],
         [ConfigKey.RESPONSE_BODY_CHECK_NEGATIVE]: ['test'],
         [ConfigKey.RESPONSE_STATUS_CHECK]: ['test'],

diff --git a/...plugins/synthetics/server/synthetics_service/project_monitor/normalizers/common_fields.ts b/...plugins/synthetics/server/synthetics_service/project_monitor/normalizers/common_fields.ts
@@ -51,7 +51,6 @@ export const getNormalizeCommonFields = ({
   namespace,
 }: NormalizedProjectProps): Partial<CommonFields> => {
   const defaultFields = DEFAULT_COMMON_FIELDS;
-
   const normalizedFields = {
     [ConfigKey.JOURNEY_ID]: monitor.id || defaultFields[ConfigKey.JOURNEY_ID],
     [ConfigKey.MONITOR_SOURCE_TYPE]: SourceType.PROJECT,
@@ -231,3 +230,7 @@ export const normalizeYamlConfig = (monitor: NormalizedProjectProps['monitor'])
     unsupportedKeys,
   };
 };
+
+// returns true when any ssl fields are defined
+export const getHasTLSFields = (monitor: ProjectMonitor) =>
+  Object.keys(monitor).some((key) => key.includes('ssl'));
diff --git a/...ins/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.test.ts b/...ins/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import { omit } from 'lodash';
 import {
   DataStream,
   Locations,
@@ -144,7 +144,7 @@ describe('http normalizers', () => {
           normalizedFields: {
             ...DEFAULT_FIELDS[DataStream.HTTP],
             __ui: {
-              is_tls_enabled: false,
+              is_tls_enabled: true,
             },
             'check.request.body': {
               type: 'json',
@@ -201,7 +201,7 @@ describe('http normalizers', () => {
           normalizedFields: {
             ...DEFAULT_FIELDS[DataStream.HTTP],
             __ui: {
-              is_tls_enabled: false,
+              is_tls_enabled: true,
             },
             'check.request.body': {
               type: 'text',
@@ -255,5 +255,145 @@ describe('http normalizers', () => {
         },
       ]);
     });
+
+    it('sets is_tls_enabled appropriately', () => {
+      const actual = normalizeProjectMonitors({
+        locations,
+        privateLocations,
+        monitors: [monitors[0], { ...omit(monitors[1], ['ssl.supported_protocols']) }],
+        projectId,
+        namespace: 'test-space',
+        version: '8.5.0',
+      });
+      expect(actual).toEqual([
+        {
+          errors: [
+            {
+              details:
+                'Multiple urls are not supported for http project monitors in 8.5.0. Please set only 1 url per monitor. You monitor was not created or updated.',
+              id: 'my-monitor-2',
+              reason: 'Unsupported Heartbeat option',
+            },
+            {
+              details:
+                'The following Heartbeat options are not supported for http project monitors in 8.5.0: check.response.body|unsupportedKey.nestedUnsupportedKey. You monitor was not created or updated.',
+              id: 'my-monitor-2',
+              reason: 'Unsupported Heartbeat option',
+            },
+          ],
+          normalizedFields: {
+            ...DEFAULT_FIELDS[DataStream.HTTP],
+            __ui: {
+              is_tls_enabled: true,
+            },
+            'check.request.body': {
+              type: 'json',
+              value: '{"json":"body"}',
+            },
+            'check.request.headers': {
+              'a-header': 'a-header-value',
+            },
+            'check.request.method': 'POST',
+            'check.response.body.negative': [],
+            'check.response.body.positive': [],
+            'check.response.headers': {},
+            'check.response.status': ['200'],
+            config_id: '',
+            custom_heartbeat_id: 'my-monitor-2-test-project-id-test-space',
+            enabled: false,
+            form_monitor_type: 'http',
+            journey_id: 'my-monitor-2',
+            locations: [],
+            max_redirects: '0',
+            name: 'My Monitor 2',
+            namespace: 'test_space',
+            origin: 'project',
+            original_space: 'test-space',
+            password: '',
+            project_id: 'test-project-id',
+            proxy_url: '',
+            'response.include_body': 'always',
+            'response.include_headers': false,
+            schedule: {
+              number: '60',
+              unit: 'm',
+            },
+            'service.name': 'test service',
+            'ssl.certificate': '',
+            'ssl.certificate_authorities': '',
+            'ssl.key': '',
+            'ssl.key_passphrase': '',
+            'ssl.supported_protocols': ['TLSv1.2', 'TLSv1.3'],
+            'ssl.verification_mode': 'full',
+            tags: [],
+            timeout: '80',
+            type: 'http',
+            urls: 'http://localhost:9200',
+            'url.port': null,
+            username: '',
+            id: '',
+            hash: testHash,
+          },
+          unsupportedKeys: ['check.response.body', 'unsupportedKey.nestedUnsupportedKey'],
+        },
+        {
+          errors: [],
+          normalizedFields: {
+            ...DEFAULT_FIELDS[DataStream.HTTP],
+            __ui: {
+              is_tls_enabled: false,
+            },
+            'check.request.body': {
+              type: 'text',
+              value: 'sometextbody',
+            },
+            'check.request.headers': {
+              'a-header': 'a-header-value',
+            },
+            'check.request.method': 'POST',
+            'check.response.body.negative': [],
+            'check.response.body.positive': ['Saved', 'saved'],
+            'check.response.headers': {},
+            'check.response.status': ['200'],
+            config_id: '',
+            custom_heartbeat_id: 'my-monitor-3-test-project-id-test-space',
+            enabled: false,
+            form_monitor_type: 'http',
+            journey_id: 'my-monitor-3',
+            locations: [],
+            max_redirects: '0',
+            name: 'My Monitor 3',
+            namespace: 'test_space',
+            origin: 'project',
+            original_space: 'test-space',
+            password: '',
+            project_id: 'test-project-id',
+            proxy_url: '',
+            'response.include_body': 'always',
+            'response.include_headers': false,
+            schedule: {
+              number: '60',
+              unit: 'm',
+            },
+            'service.name': 'test service',
+            'ssl.certificate': '',
+            'ssl.certificate_authorities': '',
+            'ssl.key': '',
+            'ssl.key_passphrase': '',
+            'ssl.supported_protocols': ['TLSv1.1', 'TLSv1.2', 'TLSv1.3'],
+            'ssl.verification_mode': 'full',
+            tags: ['tag2', 'tag2'],
+            timeout: '80',
+            type: 'http',
+            urls: 'http://localhost:9200',
+            'url.port': null,
+            username: '',
+            id: '',
+            hash: testHash,
+          },
+          unsupportedKeys: [],
+        },
+      ]);
+    });
   });
 });
diff --git a/.../plugins/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.ts b/.../plugins/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.ts
@@ -23,6 +23,7 @@ import {
   getOptionalArrayField,
   getUnsupportedKeysError,
   getMultipleUrlsOrHostsError,
+  getHasTLSFields,
 } from './common_fields';
 
 export const getNormalizeHTTPFields = ({
@@ -70,7 +71,12 @@ export const getNormalizeHTTPFields = ({
     [ConfigKey.TLS_VERSION]: get(monitor, ConfigKey.TLS_VERSION)
       ? (getOptionalListField(get(monitor, ConfigKey.TLS_VERSION)) as TLSVersion[])
       : defaultFields[ConfigKey.TLS_VERSION],
+    [ConfigKey.METADATA]: {
+      ...DEFAULT_FIELDS[DataStream.HTTP][ConfigKey.METADATA],
+      is_tls_enabled: getHasTLSFields(monitor),
+    },
   };
+
   return {
     normalizedFields: {
       ...defaultFields,