[Security Solution][Exceptions] Rule exceptions TTL - Expiration

packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/details_info/index.tsx

@@ -15,7 +15,7 @@ import * as i18n from '../../translations';
 interface MetaInfoDetailsProps {
   label: string;
   lastUpdate: JSX.Element | string;
-  lastUpdateValue: string;
+  lastUpdateValue?: string;
   dataTestSubj?: string;
 }
 
@@ -42,20 +42,24 @@ export const MetaInfoDetails = memo<MetaInfoDetailsProps>(
             {lastUpdate}
           </EuiBadge>
         </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <EuiText size="xs" css={euiBadgeFontFamily}>
-            {i18n.EXCEPTION_ITEM_CARD_META_BY}
-          </EuiText>
-        </EuiFlexItem>
-        <EuiFlexItem grow={false} data-test-subj={`${dataTestSubj || ''}lastUpdateValue`}>
-          <EuiFlexGroup responsive gutterSize="xs" alignItems="center">
+        {lastUpdateValue != null && (
+          <>
             <EuiFlexItem grow={false}>
-              <EuiBadge color="hollow" css={euiBadgeFontFamily}>
-                {lastUpdateValue}
-              </EuiBadge>
+              <EuiText size="xs" css={euiBadgeFontFamily}>
+                {i18n.EXCEPTION_ITEM_CARD_META_BY}
+              </EuiText>
             </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiFlexItem>
+            <EuiFlexItem grow={false} data-test-subj={`${dataTestSubj || ''}lastUpdateValue`}>
+              <EuiFlexGroup responsive gutterSize="xs" alignItems="center">
+                <EuiFlexItem grow={false}>
+                  <EuiBadge color="hollow" css={euiBadgeFontFamily}>
+                    {lastUpdateValue}
+                  </EuiBadge>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </EuiFlexItem>
+          </>
+        )}
       </EuiFlexGroup>
     );
   }

packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/index.tsx

@@ -44,6 +44,12 @@ export const ExceptionItemCardMetaInfo = memo<ExceptionItemCardMetaInfoProps>(
         }),
       [dataTestSubj, rules, securityLinkAnchorComponent]
     );
+
+    const isExpired = useMemo(
+      () => (item.expire_time ? new Date(item.expire_time) <= new Date() : false),
+      [item]
+    );
+
     return (
       <EuiFlexGroup alignItems="center" responsive gutterSize="s" data-test-subj={dataTestSubj}>
         {FormattedDateComponent !== null && (
@@ -77,6 +83,27 @@ export const ExceptionItemCardMetaInfo = memo<ExceptionItemCardMetaInfoProps>(
                 dataTestSubj={`${dataTestSubj || ''}UpdatedBy`}
               />
             </EuiFlexItem>
+            {item.expire_time != null && (
+              <>
+                <EuiFlexItem css={itemCss} grow={false}>
+                  <MetaInfoDetails
+                    label={
+                      isExpired
+                        ? i18n.EXCEPTION_ITEM_CARD_EXPIRED_LABEL
+                        : i18n.EXCEPTION_ITEM_CARD_EXPIRES_LABEL
+                    }
+                    lastUpdate={
+                      <FormattedDateComponent
+                        data-test-subj={`{dataTestSubj||''}formattedDateComponentExpireTime`}
+                        fieldName="expire_time"
+                        value={item.expire_time}
+                      />
+                    }
+                    dataTestSubj={`${dataTestSubj || ''}ExpireTime`}
+                  />
+                </EuiFlexItem>
+              </>
+            )}
           </>
         )}
         <EuiFlexItem>

packages/kbn-securitysolution-exception-list-components/src/exception_item_card/translations.ts

@@ -34,6 +34,20 @@ export const EXCEPTION_ITEM_CARD_UPDATED_LABEL = i18n.translate(
   }
 );
 
+export const EXCEPTION_ITEM_CARD_EXPIRES_LABEL = i18n.translate(
+  'exceptionList-components.exceptions.exceptionItem.card.expiresLabel',
+  {
+    defaultMessage: 'Expires at',
+  }
+);
+
+export const EXCEPTION_ITEM_CARD_EXPIRED_LABEL = i18n.translate(
+  'exceptionList-components.exceptions.exceptionItem.card.expiredLabel',
+  {
+    defaultMessage: 'Expired at',
+  }
+);
+
 export const EXCEPTION_ITEM_CARD_META_BY = i18n.translate(
   'exceptionList-components.exceptions.exceptionItem.card.metaDetailsBy',
   {

packages/kbn-securitysolution-exception-list-components/src/list_header/index.tsx

@@ -29,9 +29,9 @@ interface ExceptionListHeaderComponentProps {
   canUserEditList?: boolean;
   securityLinkAnchorComponent: React.ElementType; // This property needs to be removed to avoid the Prop Drilling, once we move all the common components from x-pack/security-solution/common
   onEditListDetails: (listDetails: ListDetails) => void;
-  onExportList: () => void;
   onDeleteList: () => void;
   onManageRules: () => void;
+  onExportModalOpen: () => void;
 }
 
 export interface BackOptions {
@@ -51,9 +51,9 @@ const ExceptionListHeaderComponent: FC<ExceptionListHeaderComponentProps> = ({
   backOptions,
   canUserEditList = true,
   onEditListDetails,
-  onExportList,
   onDeleteList,
   onManageRules,
+  onExportModalOpen,
 }) => {
   const { isModalVisible, listDetails, onEdit, onSave, onCancel } = useExceptionListHeader({
     name,
@@ -97,9 +97,9 @@ const ExceptionListHeaderComponent: FC<ExceptionListHeaderComponentProps> = ({
             isReadonly={isReadonly}
             canUserEditList={canUserEditList}
             securityLinkAnchorComponent={securityLinkAnchorComponent}
-            onExportList={onExportList}
             onDeleteList={onDeleteList}
             onManageRules={onManageRules}
+            onExportModalOpen={onExportModalOpen}
           />,
         ]}
         breadcrumbs={[

packages/kbn-securitysolution-exception-list-components/src/list_header/list_header.test.tsx

@@ -13,7 +13,7 @@ import { securityLinkAnchorComponentMock } from '../mocks/security_link_componen
 
 import { useExceptionListHeader as useExceptionListHeaderMock } from './use_list_header';
 const onEditListDetails = jest.fn();
-const onExportList = jest.fn();
+const onExportModalOpen = jest.fn();
 const onDeleteList = jest.fn();
 const onManageRules = jest.fn();
 const onNavigate = jest.fn();
@@ -37,7 +37,7 @@ describe('ExceptionListHeader', () => {
         linkedRules={[]}
         securityLinkAnchorComponent={securityLinkAnchorComponentMock}
         onEditListDetails={onEditListDetails}
-        onExportList={onExportList}
+        onExportModalOpen={onExportModalOpen}
         onDeleteList={onDeleteList}
         onManageRules={onManageRules}
         backOptions={{ pageId: '', path: '', onNavigate }}
@@ -67,7 +67,7 @@ describe('ExceptionListHeader', () => {
         linkedRules={[]}
         securityLinkAnchorComponent={securityLinkAnchorComponentMock}
         onEditListDetails={onEditListDetails}
-        onExportList={onExportList}
+        onExportModalOpen={onExportModalOpen}
         onDeleteList={onDeleteList}
         onManageRules={onManageRules}
         backOptions={{ pageId: '', path: '', onNavigate }}
@@ -90,7 +90,7 @@ describe('ExceptionListHeader', () => {
         linkedRules={[]}
         securityLinkAnchorComponent={securityLinkAnchorComponentMock}
         onEditListDetails={onEditListDetails}
-        onExportList={onExportList}
+        onExportModalOpen={onExportModalOpen}
         onDeleteList={onDeleteList}
         onManageRules={onManageRules}
         backOptions={{ pageId: '', path: '', onNavigate }}
@@ -120,7 +120,7 @@ describe('ExceptionListHeader', () => {
         linkedRules={[]}
         securityLinkAnchorComponent={securityLinkAnchorComponentMock}
         onEditListDetails={onEditListDetails}
-        onExportList={onExportList}
+        onExportModalOpen={onExportModalOpen}
         onDeleteList={onDeleteList}
         onManageRules={onManageRules}
         backOptions={{ pageId: '', path: '', onNavigate }}
@@ -145,7 +145,7 @@ describe('ExceptionListHeader', () => {
         linkedRules={[]}
         securityLinkAnchorComponent={securityLinkAnchorComponentMock}
         onEditListDetails={onEditListDetails}
-        onExportList={onExportList}
+        onExportModalOpen={onExportModalOpen}
         onDeleteList={onDeleteList}
         onManageRules={onManageRules}
         backOptions={{ pageId: '', path: 'test-path', onNavigate }}

packages/kbn-securitysolution-exception-list-components/src/list_header/menu_items/index.tsx

@@ -18,9 +18,9 @@ interface MenuItemsProps {
   linkedRules: Rule[];
   canUserEditList?: boolean;
   securityLinkAnchorComponent: React.ElementType; // This property needs to be removed to avoid the Prop Drilling, once we move all the common components from x-pack/security-solution/common
-  onExportList: () => void;
   onDeleteList: () => void;
   onManageRules: () => void;
+  onExportModalOpen: () => void;
 }
 
 const MenuItemsComponent: FC<MenuItemsProps> = ({
@@ -29,9 +29,9 @@ const MenuItemsComponent: FC<MenuItemsProps> = ({
   securityLinkAnchorComponent,
   isReadonly,
   canUserEditList = true,
-  onExportList,
   onDeleteList,
   onManageRules,
+  onExportModalOpen,
 }) => {
   const referencedLinks = useMemo(
     () =>
@@ -78,7 +78,7 @@ const MenuItemsComponent: FC<MenuItemsProps> = ({
             data-test-subj={`${dataTestSubj || ''}ManageRulesButton`}
             fill
             onClick={() => {
-              if (typeof onExportList === 'function') onManageRules();
+              if (typeof onManageRules === 'function') onManageRules();
             }}
           >
             {i18n.EXCEPTION_LIST_HEADER_MANAGE_RULES_BUTTON}
@@ -95,7 +95,7 @@ const MenuItemsComponent: FC<MenuItemsProps> = ({
               icon: 'exportAction',
               label: i18n.EXCEPTION_LIST_HEADER_EXPORT_ACTION,
               onClick: () => {
-                if (typeof onExportList === 'function') onExportList();
+                if (typeof onExportModalOpen === 'function') onExportModalOpen();
               },
             },
             {

packages/kbn-securitysolution-exception-list-components/src/list_header/menu_items/menu_items.test.tsx

@@ -12,7 +12,7 @@ import { MenuItems } from '.';
 import { rules } from '../../mocks/rule_references.mock';
 import { securityLinkAnchorComponentMock } from '../../mocks/security_link_component.mock';
 
-const onExportList = jest.fn();
+const onExportModalOpen = jest.fn();
 const onDeleteList = jest.fn();
 const onManageRules = jest.fn();
 describe('MenuItems', () => {
@@ -22,7 +22,7 @@ describe('MenuItems', () => {
         isReadonly={false}
         linkedRules={rules}
         securityLinkAnchorComponent={securityLinkAnchorComponentMock}
-        onExportList={onExportList}
+        onExportModalOpen={onExportModalOpen}
         onDeleteList={onDeleteList}
         onManageRules={onManageRules}
       />
@@ -38,7 +38,7 @@ describe('MenuItems', () => {
         isReadonly={false}
         linkedRules={[]}
         securityLinkAnchorComponent={securityLinkAnchorComponentMock}
-        onExportList={onExportList}
+        onExportModalOpen={onExportModalOpen}
         onDeleteList={onDeleteList}
         onManageRules={onManageRules}
       />
@@ -53,7 +53,7 @@ describe('MenuItems', () => {
         isReadonly={false}
         linkedRules={[]}
         securityLinkAnchorComponent={securityLinkAnchorComponentMock}
-        onExportList={onExportList}
+        onExportModalOpen={onExportModalOpen}
         onDeleteList={onDeleteList}
         onManageRules={onManageRules}
       />
@@ -70,7 +70,7 @@ describe('MenuItems', () => {
         canUserEditList={false}
         linkedRules={rules}
         securityLinkAnchorComponent={securityLinkAnchorComponentMock}
-        onExportList={onExportList}
+        onExportModalOpen={onExportModalOpen}
         onDeleteList={onDeleteList}
         onManageRules={onManageRules}
       />
@@ -86,7 +86,7 @@ describe('MenuItems', () => {
         canUserEditList={false}
         linkedRules={rules}
         securityLinkAnchorComponent={securityLinkAnchorComponentMock}
-        onExportList={onExportList}
+        onExportModalOpen={onExportModalOpen}
         onDeleteList={onDeleteList}
         onManageRules={onManageRules}
       />
@@ -100,37 +100,37 @@ describe('MenuItems', () => {
         isReadonly={false}
         linkedRules={rules}
         securityLinkAnchorComponent={securityLinkAnchorComponentMock}
-        onExportList={onExportList}
+        onExportModalOpen={onExportModalOpen}
         onDeleteList={onDeleteList}
         onManageRules={onManageRules}
       />
     );
     fireEvent.click(wrapper.getByTestId('ManageRulesButton'));
     expect(onManageRules).toHaveBeenCalled();
   });
-  it('should call onExportList', () => {
+  it('should call onExportModalOpen', () => {
     const wrapper = render(
       <MenuItems
         isReadonly={false}
         linkedRules={rules}
         securityLinkAnchorComponent={securityLinkAnchorComponentMock}
-        onExportList={onExportList}
+        onExportModalOpen={onExportModalOpen}
         onDeleteList={onDeleteList}
         onManageRules={onManageRules}
       />
     );
     fireEvent.click(wrapper.getByTestId('MenuActionsButtonIcon'));
     fireEvent.click(wrapper.getByTestId('MenuActionsActionItem1'));
 
-    expect(onExportList).toHaveBeenCalled();
+    expect(onExportModalOpen).toHaveBeenCalled();
   });
   it('should call onDeleteList', () => {
     const wrapper = render(
       <MenuItems
         isReadonly={false}
         linkedRules={rules}
         securityLinkAnchorComponent={securityLinkAnchorComponentMock}
-        onExportList={onExportList}
+        onExportModalOpen={onExportModalOpen}
         onDeleteList={onDeleteList}
         onManageRules={onManageRules}
       />

packages/kbn-securitysolution-exception-list-components/src/mocks/exception_list_item_schema.mock.ts

@@ -26,6 +26,7 @@ export const getExceptionListItemSchemaMock = (
     },
     { field: 'some.not.nested.field', operator: 'included', type: 'match', value: 'some value' },
   ],
+  expire_time: undefined,
   id: '1',
   item_id: 'endpoint_list_item',
   list_id: 'endpoint_list_id',

packages/kbn-securitysolution-io-ts-list-types/src/common/expire_time/index.ts

@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import * as t from 'io-ts';
+
+export const expireTime = t.string;
+export const expireTimeOrUndefined = t.union([expireTime, t.undefined]);
+export type ExpireTimeOrUndefined = t.TypeOf<typeof expireTimeOrUndefined>;

packages/kbn-securitysolution-io-ts-list-types/src/common/include_expired_exceptions/index.ts

@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+/* eslint-disable @typescript-eslint/naming-convention */
+
+import * as t from 'io-ts';
+
+export const include_expired_exceptions = t.keyof({ true: null, false: null });
+export const includeExpiredExceptionsOrUndefined = t.union([
+  include_expired_exceptions,
+  t.undefined,
+]);
+export type IncludeExpiredExceptionsOrUndefined = t.TypeOf<
+  typeof includeExpiredExceptionsOrUndefined
+>;

packages/kbn-securitysolution-io-ts-list-types/src/common/index.ts

@@ -28,6 +28,7 @@ export * from './entry_nested';
 export * from './exception_export_details';
 export * from './exception_list';
 export * from './exception_list_item_type';
+export * from './expire_time';
 export * from './filter';
 export * from './id';
 export * from './immutable';