comments

elastic · Jul 9, 2020 · 4262c59 · 4262c59
1 parent 163701d
commit 4262c59
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 18 deletions.
diff --git a/...ugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx b/...ugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx
@@ -66,7 +66,7 @@ interface AddExceptionModalProps {
     nonEcsData: TimelineNonEcsData[];
   };
   onCancel: () => void;
-  onConfirm: (didCloseAlert?: boolean) => void;
+  onConfirm: (didCloseAlert: boolean) => void;
 }
 
 const Modal = styled(EuiModal)`
@@ -222,14 +222,18 @@ export const AddExceptionModal = memo(function AddExceptionModal({
   );
 
   const retrieveAlertOsTypes = useCallback(() => {
-    const osTypes = getMappedNonEcsValue({
-      data: alertData.nonEcsData,
-      fieldName: 'host.os.family',
-    });
-    if (osTypes.length === 0) {
-      return ['windows', 'macos', 'linux'];
+    const osDefaults = ['windows', 'macos', 'linux'];
+    if (alertData) {
+      const osTypes = getMappedNonEcsValue({
+        data: alertData.nonEcsData,
+        fieldName: 'host.os.family',
+      });
+      if (osTypes.length === 0) {
+        return osDefaults;
+      }
+      return osTypes;
     }
-    return osTypes;
+    return osDefaults;
   }, [alertData]);
 
   const enrichExceptionItems = useCallback(() => {
@@ -239,11 +243,11 @@ export const AddExceptionModal = memo(function AddExceptionModal({
         ? enrichExceptionItemsWithComments(exceptionItemsToAdd, [{ comment }])
         : exceptionItemsToAdd;
     if (exceptionListType === 'endpoint') {
-      const osTypes = alertData ? retrieveAlertOsTypes() : ['windows', 'macos', 'linux'];
+      const osTypes = retrieveAlertOsTypes();
       enriched = enrichExceptionItemsWithOS(enriched, osTypes);
     }
     return enriched;
-  }, [comment, exceptionItemsToAdd, exceptionListType, alertData, retrieveAlertOsTypes]);
+  }, [comment, exceptionItemsToAdd, exceptionListType, retrieveAlertOsTypes]);
 
   const onAddExceptionConfirm = useCallback(() => {
     if (addOrUpdateExceptionItems !== null) {

diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.test.tsx
@@ -317,6 +317,30 @@ describe('Exception helpers', () => {
   });
 
   describe('#getOperatingSystems', () => {
+    test('it returns null if no operating system tag specified', () => {
+      const result = getOperatingSystems(['some tag', 'some other tag']);
+
+      expect(result).toEqual('');
+    });
+
+    test('it returns null if operating system tag malformed', () => {
+      const result = getOperatingSystems(['some tag', 'jibberos:mac,windows', 'some other tag']);
+
+      expect(result).toEqual('');
+    });
+
+    test('it returns operating systems if space included in os tag', () => {
+      const result = getOperatingSystems(['some tag', 'os: macos', 'some other tag']);
+      expect(result).toEqual(['macos']);
+    });
+
+    test('it returns operating systems if multiple os tags specified', () => {
+      const result = getOperatingSystems(['some tag', 'os: macos', 'some other tag', 'os:windows']);
+      expect(result).toEqual(['macos', 'windows']);
+    });
+  });
+
+  describe('#formatOperatingSystems', () => {
     test('it returns null if no operating system tag specified', () => {
       const result = formatOperatingSystems(getOperatingSystems(['some tag', 'some other tag']));
 

diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/helpers.tsx
@@ -453,27 +453,27 @@ export const entryHasNonEcsType = (
   exceptionItems: Array<ExceptionListItemSchema | CreateExceptionListItemSchema>,
   indexPatterns: IIndexPattern
 ): boolean => {
+  const doesFieldNameExist = (exceptionEntry: Entry): boolean => {
+    return indexPatterns.fields.some(({ name }) => name === exceptionEntry.field);
+  };
+
   if (exceptionItems.length === 0) {
     return false;
   }
   for (const { entries } of exceptionItems) {
     for (const exceptionEntry of entries ?? []) {
       if (exceptionEntry.type === 'nested') {
         for (const nestedExceptionEntry of exceptionEntry.entries) {
-          if (doesFieldNameExist(nestedExceptionEntry) === true) {
+          if (doesFieldNameExist(nestedExceptionEntry) === false) {
             return true;
           }
         }
-      } else if (doesFieldNameExist(exceptionEntry) === true) {
+      } else if (doesFieldNameExist(exceptionEntry) === false) {
         return true;
       }
     }
   }
   return false;
-
-  function doesFieldNameExist(exceptionEntry: Entry) {
-    return indexPatterns.fields.find(({ name }) => name === exceptionEntry.field) === undefined;
-  }
 };
 
 /**

diff --git a/...ck/plugins/security_solution/public/detections/components/alerts_table/default_config.tsx b/...ck/plugins/security_solution/public/detections/components/alerts_table/default_config.tsx
@@ -338,7 +338,7 @@ export const getAlertActions = ({
         }
       },
       id: 'addEndpointException',
-      isActionDisabled: () => !canUserCRUD || !hasIndexWrite || isEndpointAlert() === false,
+      isActionDisabled: () => !canUserCRUD || !hasIndexWrite || !isEndpointAlert(),
       dataTestSubj: 'add-endpoint-exception-menu-item',
       ariaLabel: 'Add Endpoint Exception',
       content: <EuiText size="m">{i18n.ACTION_ADD_ENDPOINT_EXCEPTION}</EuiText>,

diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
@@ -405,7 +405,7 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
   }, [closeAddExceptionModal]);
 
   const onAddExceptionConfirm = useCallback(
-    (didCloseAlert?: boolean) => {
+    (didCloseAlert: boolean) => {
       closeAddExceptionModal();
     },
     [closeAddExceptionModal]