Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
afee2c4
disable 'Links' button for security:READ
gergoabraham Sep 15, 2025
4b79f64
write access on shared list differentiates between rule and endpoint …
gergoabraham Sep 15, 2025
d2c4ae6
exception list detail view differenciates between rule and endpoint e…
gergoabraham Sep 15, 2025
1a0dea6
remove unnecessary check as `isReadOnly` includes it
gergoabraham Sep 15, 2025
4a61584
text: showing x of y endpoint exceptions
gergoabraham Sep 15, 2025
acb9ef9
show 'Shared exception list' menu item on siem.READ
gergoabraham Sep 15, 2025
241e8bc
small prop name fix
gergoabraham Sep 16, 2025
7671bfa
rule page exception tabs RBAC fix
gergoabraham Sep 16, 2025
d303bec
fix alerts action menu item visibility
gergoabraham Sep 16, 2025
00c94ec
disable import/create buttons on shared list page
gergoabraham Sep 17, 2025
ab8e90a
remove unnecessary memoization
gergoabraham Sep 19, 2025
a6d2803
hide Link rules button instead of disabling it
gergoabraham Sep 19, 2025
d82d192
hide import/link instead of disable
gergoabraham Sep 19, 2025
f283d87
add unit test to `useAddExceptionActions` hook
gergoabraham Sep 19, 2025
7ce2abe
Merge branch 'main' into fix-endpoint-exception-rbac-ui-issues
gergoabraham Sep 19, 2025
ddd70a4
export type for unit test
gergoabraham Sep 19, 2025
b22a115
Merge branch 'main' into fix-endpoint-exception-rbac-ui-issues
NicholasPeretti Sep 23, 2025
53b4cc3
[CI] Auto-commit changed files from 'node scripts/generate codeowners'
kibanamachine Sep 23, 2025
8dc627c
[CI] Auto-commit changed files from 'node scripts/lint_ts_projects --…
kibanamachine Sep 23, 2025
b32a5ca
Merge branch 'main' into fix-endpoint-exception-rbac-ui-issues
dasansol92 Sep 25, 2025
d428152
Merge branch 'main' into fix-endpoint-exception-rbac-ui-issues
joeypoon Sep 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const MenuItemsComponent: FC<MenuItemsProps> = ({
)}
</EuiFlexItem>

{canUserEditList && (
{canUserEditList && !isReadonly && (
<EuiFlexItem>
<EuiButton
data-test-subj={`${dataTestSubj || ''}LinkRulesButton`}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,24 @@ describe('MenuItems', () => {
expect(wrapper.getByTestId('MenuActionsActionItem3')).toBeDisabled();
});

it('should not render Manage rules', () => {
it('should not render Manage rules when read only', () => {
const wrapper = render(
<MenuItems
isReadonly={true}
canUserEditList={true}
linkedRules={rules}
securityLinkAnchorComponent={securityLinkAnchorComponentMock}
onExportList={onExportList}
onDeleteList={onDeleteList}
onDuplicateList={onDuplicateList}
onManageRules={onManageRules}
/>
);

expect(wrapper.queryByTestId('LinkRulesButton')).not.toBeInTheDocument();
});

it('should not render Manage rules if user cannot edit list', () => {
const wrapper = render(
<MenuItems
isReadonly={false}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ const ExceptionsViewerComponent = ({
...initialState,
});

const isReadOnlyOnCurrentList = isEndpointSpecified ? !canWriteEndpointExceptions : isReadOnly;

// Reducer actions
const setLastUpdated = useCallback(
(lastUpdate: string | number): void => {
Expand Down Expand Up @@ -522,7 +524,7 @@ const ExceptionsViewerComponent = ({
/>
<EuiSpacer size="m" />
<ExceptionsViewerSearchBar
canAddException={isEndpointSpecified ? !canWriteEndpointExceptions : isReadOnly}
isReadOnly={isReadOnlyOnCurrentList}
isEndpoint={isEndpointSpecified}
isSearching={viewerState === 'searching'}
onSearch={handleSearch}
Expand All @@ -533,8 +535,8 @@ const ExceptionsViewerComponent = ({
<EuiSpacer size="l" />

<ExceptionsViewerItems
isReadOnly={isEndpointSpecified ? !canWriteEndpointExceptions : isReadOnly}
disableActions={isReadOnly || viewerState === 'deleting' || !canWriteEndpointExceptions}
isReadOnly={isReadOnlyOnCurrentList}
disableActions={isReadOnlyOnCurrentList || viewerState === 'deleting'}
exceptions={exceptions}
isEndpoint={isEndpointSpecified}
ruleReferences={allReferences}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describe('ExceptionsViewerSearchBar', () => {
onSearch={jest.fn()}
onAddExceptionClick={jest.fn()}
isSearching={false}
canAddException
isReadOnly
/>
);

Expand All @@ -29,7 +29,7 @@ describe('ExceptionsViewerSearchBar', () => {
const mockOnAddExceptionClick = jest.fn();
const wrapper = mount(
<ExceptionsViewerSearchBar
canAddException={false}
isReadOnly={false}
isEndpoint={false}
isSearching={false}
onSearch={jest.fn()}
Expand All @@ -49,7 +49,7 @@ describe('ExceptionsViewerSearchBar', () => {
const mockOnAddExceptionClick = jest.fn();
const wrapper = mount(
<ExceptionsViewerSearchBar
canAddException={false}
isReadOnly={false}
isEndpoint={true}
isSearching={false}
onSearch={jest.fn()}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const ITEMS_SCHEMA = {
};

interface ExceptionsViewerSearchBarProps {
canAddException: boolean;
isReadOnly: boolean;
// Exception list type used to determine what type of item is
// being created when "onAddExceptionClick" is invoked
isEndpoint: boolean;
Expand All @@ -56,7 +56,7 @@ interface ExceptionsViewerSearchBarProps {
* Search exception items and take actions (to creat an item)
*/
const ExceptionsViewerSearchBarComponent = ({
canAddException,
isReadOnly,
isEndpoint,
isSearching,
onSearch,
Expand Down Expand Up @@ -91,7 +91,7 @@ const ExceptionsViewerSearchBarComponent = ({
onChange={handleOnSearch}
/>
</EuiFlexItem>
{!canAddException && (
{!isReadOnly && (
<EuiFlexItem grow={false}>
<EuiButton
data-test-subj="exceptionsHeaderAddExceptionBtn"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
/*
* 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; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

import { renderHook } from '@testing-library/react';
import { TestProviders } from '../../../../common/mock';
import { useAlertExceptionActions } from './use_add_exception_actions';
import { useUserData } from '../../user_info';
import { useEndpointExceptionsCapability } from '../../../../exceptions/hooks/use_endpoint_exceptions_capability';

jest.mock('../../user_info');
const mockUseUserData = useUserData as jest.Mock;

jest.mock('../../../../exceptions/hooks/use_endpoint_exceptions_capability');
const mockUseEndpointExceptionsCapability = useEndpointExceptionsCapability as jest.Mock;

describe('useAlertExceptionActions', () => {
afterEach(() => {
jest.clearAllMocks();
});

it('should return both add rule exception and add endpoint exception menu items with all privileges', () => {
mockUseUserData.mockReturnValue([{ canUserCRUD: true, hasIndexWrite: true }]);
mockUseEndpointExceptionsCapability.mockReturnValue(true);

const { result } = renderHook(
() => useAlertExceptionActions({ isEndpointAlert: true, onAddExceptionTypeClick: jest.fn() }),
{ wrapper: TestProviders }
);

expect(result.current.exceptionActionItems.length).toEqual(2);
expect(result.current.exceptionActionItems.map(({ key, disabled }) => [key, disabled])).toEqual(
[
['add-endpoint-exception-menu-item', false],
['add-exception-menu-item', false],
]
);
});

it('should disable adding endpoint exceptions when user has no endpoint exceptions ALL privilege', () => {
mockUseUserData.mockReturnValue([{ canUserCRUD: true, hasIndexWrite: true }]);
mockUseEndpointExceptionsCapability.mockReturnValue(false);

const { result } = renderHook(
() => useAlertExceptionActions({ isEndpointAlert: true, onAddExceptionTypeClick: jest.fn() }),
{ wrapper: TestProviders }
);

expect(result.current.exceptionActionItems.length).toEqual(2);
expect(result.current.exceptionActionItems.map(({ key, disabled }) => [key, disabled])).toEqual(
[
['add-endpoint-exception-menu-item', true],
['add-exception-menu-item', false],
]
);
});

it('should disable adding endpoint exceptions when alert is not an endpoint alert', () => {
mockUseUserData.mockReturnValue([{ canUserCRUD: true, hasIndexWrite: true }]);
mockUseEndpointExceptionsCapability.mockReturnValue(true);

const { result } = renderHook(
() =>
useAlertExceptionActions({ isEndpointAlert: false, onAddExceptionTypeClick: jest.fn() }),
{ wrapper: TestProviders }
);

expect(result.current.exceptionActionItems.length).toEqual(2);
expect(result.current.exceptionActionItems.map(({ key, disabled }) => [key, disabled])).toEqual(
[
['add-endpoint-exception-menu-item', true],
['add-exception-menu-item', false],
]
);
});

it('should disable adding rule exceptions when user has no security:ALL privilege', () => {
mockUseUserData.mockReturnValue([{ canUserCRUD: false, hasIndexWrite: true }]);
mockUseEndpointExceptionsCapability.mockReturnValue(true);

const { result } = renderHook(
() => useAlertExceptionActions({ isEndpointAlert: true, onAddExceptionTypeClick: jest.fn() }),
{ wrapper: TestProviders }
);

expect(result.current.exceptionActionItems.length).toEqual(2);
expect(result.current.exceptionActionItems.map(({ key, disabled }) => [key, disabled])).toEqual(
[
['add-endpoint-exception-menu-item', false],
['add-exception-menu-item', true],
]
);
});

it('should disable adding rule exceptions when user has no index write privilege', () => {
mockUseUserData.mockReturnValue([{ canUserCRUD: true, hasIndexWrite: false }]);
mockUseEndpointExceptionsCapability.mockReturnValue(true);

const { result } = renderHook(
() => useAlertExceptionActions({ isEndpointAlert: true, onAddExceptionTypeClick: jest.fn() }),
{ wrapper: TestProviders }
);

expect(result.current.exceptionActionItems.length).toEqual(2);
expect(result.current.exceptionActionItems.map(({ key, disabled }) => [key, disabled])).toEqual(
[
['add-endpoint-exception-menu-item', false],
['add-exception-menu-item', true],
]
);
});

it('should not return menu items when user has neither security:ALL nor endpoint exceptions ALL privilege', () => {
mockUseUserData.mockReturnValue([{ canUserCRUD: false, hasIndexWrite: true }]);
mockUseEndpointExceptionsCapability.mockReturnValue(false);

const { result } = renderHook(
() => useAlertExceptionActions({ isEndpointAlert: true, onAddExceptionTypeClick: jest.fn() }),
{ wrapper: TestProviders }
);

expect(result.current.exceptionActionItems.length).toEqual(0);
});

it('should not return menu items when user has neither index write and it is not an endpoint alert', () => {
mockUseUserData.mockReturnValue([{ canUserCRUD: true, hasIndexWrite: false }]);
mockUseEndpointExceptionsCapability.mockReturnValue(true);

const { result } = renderHook(
() =>
useAlertExceptionActions({ isEndpointAlert: false, onAddExceptionTypeClick: jest.fn() }),
{ wrapper: TestProviders }
);

expect(result.current.exceptionActionItems.length).toEqual(0);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@ import { useUserData } from '../../user_info';
import { ACTION_ADD_ENDPOINT_EXCEPTION, ACTION_ADD_EXCEPTION } from '../translations';
import type { AlertTableContextMenuItem } from '../types';

interface UseExceptionActionProps {
export interface UseExceptionActionProps {
isEndpointAlert: boolean;
onAddExceptionTypeClick: (type?: ExceptionListTypeEnum) => void;
}

export const useExceptionActions = ({
export const useAlertExceptionActions = ({
isEndpointAlert,
onAddExceptionTypeClick,
}: UseExceptionActionProps) => {
const [{ canUserCRUD, hasIndexWrite }] = useUserData();
const canWriteEndpointExceptions = useEndpointExceptionsCapability('crudEndpointExceptions');

const handleDetectionExceptionModal = useCallback(() => {
onAddExceptionTypeClick();
Expand All @@ -32,12 +33,12 @@ export const useExceptionActions = ({
onAddExceptionTypeClick(ExceptionListTypeEnum.ENDPOINT);
}, [onAddExceptionTypeClick]);

const disabledAddEndpointException = !canUserCRUD || !hasIndexWrite || !isEndpointAlert;
const disabledAddEndpointException = !canWriteEndpointExceptions || !isEndpointAlert;
const disabledAddException = !canUserCRUD || !hasIndexWrite;

const exceptionActionItems: AlertTableContextMenuItem[] = useMemo(
() =>
disabledAddException
disabledAddException && disabledAddEndpointException
? []
: [
{
Expand Down Expand Up @@ -65,29 +66,3 @@ export const useExceptionActions = ({

return { exceptionActionItems };
};

export const useAlertExceptionActions = ({
isEndpointAlert,
onAddExceptionTypeClick,
}: UseExceptionActionProps) => {
const { exceptionActionItems } = useExceptionActions({
isEndpointAlert,
onAddExceptionTypeClick,
});

const canWriteEndpointExceptions = useEndpointExceptionsCapability('crudEndpointExceptions');
// Endpoint exceptions are available for:
// Serverless Endpoint Essentials/Complete PLI and
// on ESS Security Kibana sub-feature Endpoint Exceptions (enabled when Security feature is enabled)
if (!canWriteEndpointExceptions) {
return {
exceptionActionItems: exceptionActionItems.map((item) => {
return {
...item,
disabled: item.name === ACTION_ADD_ENDPOINT_EXCEPTION,
} as AlertTableContextMenuItem;
}),
};
}
return { exceptionActionItems };
};
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/
import type { FC } from 'react';
import React, { useMemo } from 'react';
import React from 'react';
import type {
ExceptionListItemIdentifiers,
GetExceptionItemProps,
Expand All @@ -22,7 +22,6 @@ import { getFormattedComments } from '../../utils/ui.helpers';
import { LinkToRuleDetails } from '../link_to_rule_details';
import { ExceptionsUtility } from '../exceptions_utility';
import * as i18n from '../../translations/list_exception_items';
import { useEndpointExceptionsCapability } from '../../hooks/use_endpoint_exceptions_capability';
import { ShowValueListModal } from '../../../value_list/components/show_value_list_modal';

interface ListExceptionItemsProps {
Expand Down Expand Up @@ -60,27 +59,28 @@ const ListExceptionItemsComponent: FC<ListExceptionItemsProps> = ({
onPaginationChange,
onCreateExceptionListItem,
}) => {
const canWriteEndpointExceptions = useEndpointExceptionsCapability('crudEndpointExceptions');

const editButtonText = useMemo(() => {
return listType === ExceptionListTypeEnum.ENDPOINT
const editButtonText =
listType === ExceptionListTypeEnum.ENDPOINT
? i18n.EXCEPTION_ITEM_CARD_EDIT_ENDPOINT_LABEL
: i18n.EXCEPTION_ITEM_CARD_EDIT_LABEL;
}, [listType]);

const deleteButtonText = useMemo(() => {
return listType === ExceptionListTypeEnum.ENDPOINT
const deleteButtonText =
listType === ExceptionListTypeEnum.ENDPOINT
? i18n.EXCEPTION_ITEM_CARD_DELETE_ENDPOINT_LABEL
: i18n.EXCEPTION_ITEM_CARD_DELETE_LABEL;
}, [listType]);

const exceptionsTitle =
listType === ExceptionListTypeEnum.ENDPOINT
? i18n.EXCEPTION_UTILITY_ENDPOINT_TITLE
: i18n.EXCEPTION_UTILITY_TITLE;

return (
<>
<ExceptionItems
viewerStatus={viewerStatus as ViewerStatus}
listType={listType as ExceptionListTypeEnum}
ruleReferences={ruleReferences}
isReadOnly={isReadOnly || !canWriteEndpointExceptions}
isReadOnly={isReadOnly}
exceptions={exceptions}
emptyViewerTitle={emptyViewerTitle}
emptyViewerBody={emptyViewerBody}
Expand All @@ -99,7 +99,7 @@ const ListExceptionItemsComponent: FC<ListExceptionItemsProps> = ({
exceptionsUtilityComponent={() =>
hideUtility ? null : (
<ExceptionsUtility
exceptionsTitle={i18n.EXCEPTION_UTILITY_TITLE}
exceptionsTitle={exceptionsTitle}
pagination={pagination}
lastUpdated={lastUpdated}
/>
Expand Down
Loading