Merge branch 'master' of github.com:elastic/kibana into alerting/emai…

…l-footer-url
elastic · Dec 14, 2020 · f076a2f · f076a2f
2 parents 800e3b5 + 8279c2d
commit f076a2f
Show file tree

Hide file tree

Showing 67 changed files with 1,115 additions and 124 deletions.
diff --git a/x-pack/plugins/case/common/api/cases/case.ts b/x-pack/plugins/case/common/api/cases/case.ts
@@ -29,12 +29,17 @@ const CaseStatusRt = rt.union([
 
 export const caseStatuses = Object.values(CaseStatuses);
 
+const SettingsRt = rt.type({
+  syncAlerts: rt.boolean,
+});
+
 const CaseBasicRt = rt.type({
-  connector: CaseConnectorRt,
   description: rt.string,
   status: CaseStatusRt,
   tags: rt.array(rt.string),
   title: rt.string,
+  connector: CaseConnectorRt,
+  settings: SettingsRt,
 });
 
 const CaseExternalServiceBasicRt = rt.type({
@@ -74,6 +79,7 @@ export const CasePostRequestRt = rt.type({
   tags: rt.array(rt.string),
   title: rt.string,
   connector: CaseConnectorRt,
+  settings: SettingsRt,
 });
 
 export const CaseExternalServiceRequestRt = CaseExternalServiceBasicRt;

diff --git a/x-pack/plugins/case/common/api/cases/user_actions.ts b/x-pack/plugins/case/common/api/cases/user_actions.ts
@@ -20,6 +20,7 @@ const UserActionFieldRt = rt.array(
     rt.literal('tags'),
     rt.literal('title'),
     rt.literal('status'),
+    rt.literal('settings'),
   ])
 );
 const UserActionRt = rt.union([

diff --git a/x-pack/plugins/case/kibana.json b/x-pack/plugins/case/kibana.json
@@ -2,7 +2,7 @@
   "configPath": ["xpack", "case"],
   "id": "case",
   "kibanaVersion": "kibana",
-  "requiredPlugins": ["actions"],
+  "requiredPlugins": ["actions", "securitySolution"],
   "optionalPlugins": [
     "spaces",
     "security"

diff --git a/x-pack/plugins/case/server/client/alerts/update_status.ts b/x-pack/plugins/case/server/client/alerts/update_status.ts
@@ -0,0 +1,25 @@
+/*
+ * 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 Boom from '@hapi/boom';
+import { CaseClientUpdateAlertsStatus, CaseClientFactoryArguments } from '../types';
+
+export const updateAlertsStatus = ({
+  alertsService,
+  request,
+  context,
+}: CaseClientFactoryArguments) => async ({
+  ids,
+  status,
+}: CaseClientUpdateAlertsStatus): Promise<void> => {
+  const securitySolutionClient = context?.securitySolution?.getAppClient();
+  if (securitySolutionClient == null) {
+    throw Boom.notFound('securitySolutionClient client have not been found');
+  }
+
+  const index = securitySolutionClient.getSignalsIndex();
+  await alertsService.updateAlertsStatus({ ids, status, index, request });
+};
diff --git a/x-pack/plugins/case/server/client/cases/create.test.ts b/x-pack/plugins/case/server/client/cases/create.test.ts
@@ -34,6 +34,9 @@ describe('create', () => {
           type: ConnectorTypes.jira,
           fields: { issueType: 'Task', priority: 'High', parent: null },
         },
+        settings: {
+          syncAlerts: true,
+        },
       } as CasePostRequest;
 
       const savedObjectsClient = createMockSavedObjectsRepository({
@@ -65,6 +68,9 @@ describe('create', () => {
         updated_at: null,
         updated_by: null,
         version: 'WzksMV0=',
+        settings: {
+          syncAlerts: true,
+        },
       });
 
       expect(
@@ -79,9 +85,9 @@ describe('create', () => {
               full_name: 'Awesome D00d',
               username: 'awesome',
             },
-            action_field: ['description', 'status', 'tags', 'title', 'connector'],
+            action_field: ['description', 'status', 'tags', 'title', 'connector', 'settings'],
             new_value:
-              '{"description":"This is a brand new case of a bad meanie defacing data","title":"Super Bad Security Issue","tags":["defacement"],"connector":{"id":"123","name":"Jira","type":".jira","fields":{"issueType":"Task","priority":"High","parent":null}}}',
+              '{"description":"This is a brand new case of a bad meanie defacing data","title":"Super Bad Security Issue","tags":["defacement"],"connector":{"id":"123","name":"Jira","type":".jira","fields":{"issueType":"Task","priority":"High","parent":null}},"settings":{"syncAlerts":true}}',
             old_value: null,
           },
           references: [
@@ -106,6 +112,9 @@ describe('create', () => {
           type: ConnectorTypes.none,
           fields: null,
         },
+        settings: {
+          syncAlerts: true,
+        },
       };
 
       const savedObjectsClient = createMockSavedObjectsRepository({
@@ -131,6 +140,9 @@ describe('create', () => {
         updated_at: null,
         updated_by: null,
         version: 'WzksMV0=',
+        settings: {
+          syncAlerts: true,
+        },
       });
     });
 
@@ -145,6 +157,9 @@ describe('create', () => {
           type: ConnectorTypes.none,
           fields: null,
         },
+        settings: {
+          syncAlerts: true,
+        },
       };
 
       const savedObjectsClient = createMockSavedObjectsRepository({
@@ -174,6 +189,9 @@ describe('create', () => {
         updated_at: null,
         updated_by: null,
         version: 'WzksMV0=',
+        settings: {
+          syncAlerts: true,
+        },
       });
     });
   });
@@ -323,6 +341,9 @@ describe('create', () => {
           type: ConnectorTypes.none,
           fields: null,
         },
+        settings: {
+          syncAlerts: true,
+        },
       };
 
       const savedObjectsClient = createMockSavedObjectsRepository({
@@ -347,6 +368,9 @@ describe('create', () => {
           type: ConnectorTypes.none,
           fields: null,
         },
+        settings: {
+          syncAlerts: true,
+        },
       };
       const savedObjectsClient = createMockSavedObjectsRepository({
         caseSavedObject: mockCases,

diff --git a/x-pack/plugins/case/server/client/cases/create.ts b/x-pack/plugins/case/server/client/cases/create.ts
@@ -64,7 +64,7 @@ export const create = ({
         actionAt: createdDate,
         actionBy: { username, full_name, email },
         caseId: newCase.id,
-        fields: ['description', 'status', 'tags', 'title', 'connector'],
+        fields: ['description', 'status', 'tags', 'title', 'connector', 'settings'],
         newValue: JSON.stringify(query),
       }),
     ],

diff --git a/x-pack/plugins/case/server/client/cases/update.test.ts b/x-pack/plugins/case/server/client/cases/update.test.ts
@@ -38,7 +38,10 @@ describe('update', () => {
       });
 
       const caseClient = await createCaseClientWithMockSavedObjectsClient(savedObjectsClient);
-      const res = await caseClient.client.update({ cases: patchCases });
+      const res = await caseClient.client.update({
+        caseClient: caseClient.client,
+        cases: patchCases,
+      });
 
       expect(res).toEqual([
         {
@@ -63,6 +66,9 @@ describe('update', () => {
           updated_at: '2019-11-25T21:54:48.952Z',
           updated_by: { email: 'd00d@awesome.com', full_name: 'Awesome D00d', username: 'awesome' },
           version: 'WzE3LDFd',
+          settings: {
+            syncAlerts: true,
+          },
         },
       ]);
 
@@ -115,7 +121,10 @@ describe('update', () => {
       });
 
       const caseClient = await createCaseClientWithMockSavedObjectsClient(savedObjectsClient);
-      const res = await caseClient.client.update({ cases: patchCases });
+      const res = await caseClient.client.update({
+        caseClient: caseClient.client,
+        cases: patchCases,
+      });
 
       expect(res).toEqual([
         {
@@ -140,6 +149,9 @@ describe('update', () => {
           updated_at: '2019-11-25T21:54:48.952Z',
           updated_by: { email: 'd00d@awesome.com', full_name: 'Awesome D00d', username: 'awesome' },
           version: 'WzE3LDFd',
+          settings: {
+            syncAlerts: true,
+          },
         },
       ]);
     });
@@ -160,7 +172,10 @@ describe('update', () => {
       });
 
       const caseClient = await createCaseClientWithMockSavedObjectsClient(savedObjectsClient);
-      const res = await caseClient.client.update({ cases: patchCases });
+      const res = await caseClient.client.update({
+        caseClient: caseClient.client,
+        cases: patchCases,
+      });
 
       expect(res).toEqual([
         {
@@ -185,6 +200,9 @@ describe('update', () => {
           updated_at: '2019-11-25T21:54:48.952Z',
           updated_by: { email: 'd00d@awesome.com', full_name: 'Awesome D00d', username: 'awesome' },
           version: 'WzE3LDFd',
+          settings: {
+            syncAlerts: true,
+          },
         },
       ]);
     });
@@ -210,7 +228,10 @@ describe('update', () => {
       });
 
       const caseClient = await createCaseClientWithMockSavedObjectsClient(savedObjectsClient);
-      const res = await caseClient.client.update({ cases: patchCases });
+      const res = await caseClient.client.update({
+        caseClient: caseClient.client,
+        cases: patchCases,
+      });
 
       expect(res).toEqual([
         {
@@ -243,6 +264,9 @@ describe('update', () => {
             username: 'awesome',
           },
           version: 'WzE3LDFd',
+          settings: {
+            syncAlerts: true,
+          },
         },
       ]);
     });
@@ -328,7 +352,7 @@ describe('update', () => {
       });
 
       const caseClient = await createCaseClientWithMockSavedObjectsClient(savedObjectsClient);
-      caseClient.client.update({ cases: patchCases }).catch((e) => {
+      caseClient.client.update({ caseClient: caseClient.client, cases: patchCases }).catch((e) => {
         expect(e).not.toBeNull();
         expect(e.isBoom).toBe(true);
         expect(e.output.statusCode).toBe(406);
@@ -358,7 +382,7 @@ describe('update', () => {
       });
 
       const caseClient = await createCaseClientWithMockSavedObjectsClient(savedObjectsClient);
-      caseClient.client.update({ cases: patchCases }).catch((e) => {
+      caseClient.client.update({ caseClient: caseClient.client, cases: patchCases }).catch((e) => {
         expect(e).not.toBeNull();
         expect(e.isBoom).toBe(true);
         expect(e.output.statusCode).toBe(404);
@@ -385,7 +409,7 @@ describe('update', () => {
       });
 
       const caseClient = await createCaseClientWithMockSavedObjectsClient(savedObjectsClient);
-      caseClient.client.update({ cases: patchCases }).catch((e) => {
+      caseClient.client.update({ caseClient: caseClient.client, cases: patchCases }).catch((e) => {
         expect(e).not.toBeNull();
         expect(e.isBoom).toBe(true);
         expect(e.output.statusCode).toBe(409);

diff --git a/x-pack/plugins/case/server/client/cases/update.ts b/x-pack/plugins/case/server/client/cases/update.ts
@@ -9,6 +9,7 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 
+import { SavedObjectsFindResponse } from 'kibana/server';
 import { flattenCaseSavedObject } from '../../routes/api/utils';
 
 import {
@@ -34,7 +35,10 @@ export const update = ({
   caseService,
   userActionService,
   request,
-}: CaseClientFactoryArguments) => async ({ cases }: CaseClientUpdate): Promise<CasesResponse> => {
+}: CaseClientFactoryArguments) => async ({
+  caseClient,
+  cases,
+}: CaseClientUpdate): Promise<CasesResponse> => {
   const query = pipe(
     excess(CasesPatchRequestRt).decode(cases),
     fold(throwErrors(Boom.badRequest), identity)
@@ -126,6 +130,65 @@ export const update = ({
       }),
     });
 
+    // If a status update occurred and the case is synced then we need to update all alerts' status
+    // attached to the case to the new status.
+    const casesWithStatusChangedAndSynced = updateFilterCases.filter((caseToUpdate) => {
+      const currentCase = myCases.saved_objects.find((c) => c.id === caseToUpdate.id);
+      return (
+        currentCase != null &&
+        caseToUpdate.status != null &&
+        currentCase.attributes.status !== caseToUpdate.status &&
+        currentCase.attributes.settings.syncAlerts
+      );
+    });
+
+    // If syncAlerts setting turned on we need to update all alerts' status
+    // attached to the case to the current status.
+    const casesWithSyncSettingChangedToOn = updateFilterCases.filter((caseToUpdate) => {
+      const currentCase = myCases.saved_objects.find((c) => c.id === caseToUpdate.id);
+      return (
+        currentCase != null &&
+        caseToUpdate.settings?.syncAlerts != null &&
+        currentCase.attributes.settings.syncAlerts !== caseToUpdate.settings.syncAlerts &&
+        caseToUpdate.settings.syncAlerts
+      );
+    });
+
+    for (const theCase of [
+      ...casesWithSyncSettingChangedToOn,
+      ...casesWithStatusChangedAndSynced,
+    ]) {
+      const currentCase = myCases.saved_objects.find((c) => c.id === theCase.id);
+      const totalComments = await caseService.getAllCaseComments({
+        client: savedObjectsClient,
+        caseId: theCase.id,
+        options: {
+          fields: [],
+          filter: 'cases-comments.attributes.type: alert',
+          page: 1,
+          perPage: 1,
+        },
+      });
+
+      const caseComments = (await caseService.getAllCaseComments({
+        client: savedObjectsClient,
+        caseId: theCase.id,
+        options: {
+          fields: [],
+          filter: 'cases-comments.attributes.type: alert',
+          page: 1,
+          perPage: totalComments.total,
+        },
+        // The filter guarantees that the comments will be of type alert
+      })) as SavedObjectsFindResponse<{ alertId: string }>;
+
+      caseClient.updateAlertsStatus({
+        ids: caseComments.saved_objects.map(({ attributes: { alertId } }) => alertId),
+        // Either there is a status update or the syncAlerts got turned on.
+        status: theCase.status ?? currentCase?.attributes.status ?? CaseStatuses.open,
+      });
+    }
+
     const returnUpdatedCase = myCases.saved_objects
       .filter((myCase) =>
         updatedCases.saved_objects.some((updatedCase) => updatedCase.id === myCase.id)