Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -65,6 +65,7 @@ export enum SecurityPageName {
rulesAdd = 'rules-add',
rulesCreate = 'rules-create',
rulesLanding = 'rules-landing',
rulesManagement = 'rules-management',
siemMigrationsRules = 'siem_migrations-rules',
/*
* Warning: Computed values are not permitted in an enum with string valued members
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ export const RULES_LANDING_PATH = `${RULES_PATH}/landing` as const;
export const RULES_ADD_PATH = `${RULES_PATH}/add_rules` as const;
export const RULES_UPDATES = `${RULES_PATH}/updates` as const;
export const RULES_CREATE_PATH = `${RULES_PATH}/create` as const;
export const RULES_MANAGEMENT_PATH = `${RULES_PATH}/management` as const;
export const EXCEPTIONS_PATH = '/exceptions' as const;
export const EXCEPTION_LIST_DETAIL_PATH = `${EXCEPTIONS_PATH}/details/:detailName` as const;
export const HOSTS_PATH = '/hosts' as const;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import {
EuiSpacer,
EuiTab,
EuiTabs,
EuiText,
} from '@elastic/eui';
import React, { useCallback, useMemo, useState } from 'react';
import type { FindRulesSortField } from '../../../../common/api/detection_engine';
Expand Down Expand Up @@ -201,7 +200,6 @@ const useRulesColumns = ({ currentTab }: ColumnsProps): Array<EuiBasicTableColum
return [
{
...RULE_NAME_COLUMN,
render: (value: Rule['name']) => <EuiText size="s">{value}</EuiText>,
width: '30%',
} as EuiBasicTableColumn<Rule>,
INDEXING_DURATION_COLUMN,
Expand All @@ -217,7 +215,6 @@ const useRulesColumns = ({ currentTab }: ColumnsProps): Array<EuiBasicTableColum
return [
{
...RULE_NAME_COLUMN,
render: (value: Rule['name']) => <EuiText size="s">{value}</EuiText>,
width: '100%',
} as EuiBasicTableColumn<Rule>,
LAST_EXECUTION_COLUMN,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
RULES_ADD_PATH,
RULES_CREATE_PATH,
RULES_LANDING_PATH,
RULES_MANAGEMENT_PATH,
RULES_PATH,
SECURITY_FEATURE_ID,
} from '../../common/constants';
Expand All @@ -38,7 +39,7 @@ export const links: LinkItem = {
hideTimeline: true,
skipUrlState: true,
globalNavPosition: 2,
capabilities: [[`${SECURITY_FEATURE_ID}.show`, `${SECURITY_FEATURE_ID}.detections`]],
capabilities: `${SECURITY_FEATURE_ID}.show`,
links: [
{
id: SecurityPageName.rules,
Expand All @@ -53,20 +54,32 @@ export const links: LinkItem = {
defaultMessage: 'SIEM Rules',
}),
],
capabilities: `${SECURITY_FEATURE_ID}.show`,
links: [
{
id: SecurityPageName.rulesManagement,
title: SIEM_RULES,
path: RULES_MANAGEMENT_PATH,
globalSearchDisabled: true,
skipUrlState: true,
hideTimeline: true,
capabilities: `${SECURITY_FEATURE_ID}.detections`,
},
{
id: SecurityPageName.rulesAdd,
title: ADD_RULES,
path: RULES_ADD_PATH,
skipUrlState: true,
hideTimeline: true,
capabilities: `${SECURITY_FEATURE_ID}.detections`,
},
{
id: SecurityPageName.rulesCreate,
title: CREATE_NEW_RULE,
path: RULES_CREATE_PATH,
skipUrlState: true,
hideTimeline: false,
capabilities: `${SECURITY_FEATURE_ID}.detections`,
},
],
},
Expand Down Expand Up @@ -100,7 +113,7 @@ export const links: LinkItem = {
}
),
path: COVERAGE_OVERVIEW_PATH,
capabilities: [`${SECURITY_FEATURE_ID}.show`],
capabilities: `${SECURITY_FEATURE_ID}.detections`,
globalSearchKeywords: [
i18n.translate('xpack.securitySolution.appLinks.coverageOverviewDashboard', {
defaultMessage: 'MITRE ATT&CK Coverage',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import React from 'react';
import React, { useMemo } from 'react';
import { Redirect } from 'react-router-dom';
import { Routes, Route } from '@kbn/shared-ux-router';

import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
import type { Capabilities } from '@kbn/core-capabilities-common';
import * as i18n from './translations';
import {
COVERAGE_OVERVIEW_PATH,
RULES_LANDING_PATH,
RULES_PATH,
SECURITY_FEATURE_ID,
SecurityPageName,
} from '../../common/constants';
import { NotFoundPage } from '../app/404';
Expand All @@ -30,80 +31,98 @@ import type { SecuritySubPluginRoutes } from '../app/types';
import { RulesLandingPage } from './landing';
import { CoverageOverviewPage } from '../detection_engine/rule_management_ui/pages/coverage_overview';
import { RuleDetailTabs } from '../detection_engine/rule_details_ui/pages/rule_details/use_rule_details_tabs';
import {
SecurityRoutePageWrapper,
withSecurityRoutePageWrapper,
} from '../common/components/security_route_page_wrapper';
import { withSecurityRoutePageWrapper } from '../common/components/security_route_page_wrapper';
import { hasCapabilities } from '../common/lib/capabilities';
import { useKibana } from '../common/lib/kibana/kibana_react';

const RulesSubRoutes = [
{
path: '/rules/id/:detailName/edit',
main: EditRulePage,
exact: true,
},
{
path: `/rules/id/:detailName/:tabName(${RuleDetailTabs.alerts}|${RuleDetailTabs.exceptions}|${RuleDetailTabs.endpointExceptions}|${RuleDetailTabs.executionResults}|${RuleDetailTabs.executionEvents})`,
main: RuleDetailsPage,
exact: true,
},
const getRulesSubRoutes = (capabilities: Capabilities) => [
...(hasCapabilities(capabilities, `${SECURITY_FEATURE_ID}.detections`) // regular detection rules are enabled
? [
{
path: '/rules/id/:detailName/edit',
main: EditRulePage,
exact: true,
},
]
: []),
...(hasCapabilities(capabilities, [
`${SECURITY_FEATURE_ID}.detections`,
`${SECURITY_FEATURE_ID}.external_detections`,
]) // some detection capability is enabled
? [
{
path: `/rules/id/:detailName/:tabName(${RuleDetailTabs.alerts}|${RuleDetailTabs.exceptions}|${RuleDetailTabs.endpointExceptions}|${RuleDetailTabs.executionResults}|${RuleDetailTabs.executionEvents})`,
main: RuleDetailsPage,
exact: true,
},
]
: []),
{
path: '/rules/create',
main: CreateRulePage,
main: withSecurityRoutePageWrapper(CreateRulePage, SecurityPageName.rulesCreate, {
redirectOnMissing: true,
omitSpyRoute: true,
}),
exact: true,
},
{
path: `/rules/:tabName(${AllRulesTabs.management}|${AllRulesTabs.monitoring}|${AllRulesTabs.updates})`,
main: RulesPage,
main: withSecurityRoutePageWrapper(RulesPage, SecurityPageName.rulesManagement, {
redirectOnMissing: true,
omitSpyRoute: true,
}),
exact: true,
},
{
path: '/rules/add_rules',
main: AddRulesPage,
main: withSecurityRoutePageWrapper(AddRulesPage, SecurityPageName.rulesAdd, {
redirectOnMissing: true,
omitSpyRoute: true,
}),
exact: true,
},
];

const RulesContainerComponent: React.FC = () => {
useReadonlyHeader(i18n.READ_ONLY_BADGE_TOOLTIP);
const { capabilities } = useKibana().services.application;

const subRoutes = useMemo(() => {
return getRulesSubRoutes(capabilities).map((route) => (
<Route key={`rules-route-${route.path}`} path={route.path} exact={route?.exact ?? false}>
<route.main />
</Route>
));
}, [capabilities]);

return (
<PluginTemplateWrapper>
<SecurityRoutePageWrapper pageName={SecurityPageName.rules} redirectOnMissing omitSpyRoute>
<Routes>
<Route // Redirect to first tab if none specified
path="/rules/id/:detailName"
exact
render={({
match: {
params: { detailName },
},
location,
}) => (
<Redirect
to={{
...location,
pathname: `/rules/id/${detailName}/${RuleDetailTabs.alerts}`,
search: location.search,
}}
/>
)}
/>
<Route path="/rules" exact>
<Redirect to={`/rules/${AllRulesTabs.management}`} />
</Route>
{RulesSubRoutes.map((route) => (
<Route
key={`rules-route-${route.path}`}
path={route.path}
exact={route?.exact ?? false}
>
<route.main />
</Route>
))}
<Route component={NotFoundPage} />
<SpyRoute pageName={SecurityPageName.rules} />
</Routes>
</SecurityRoutePageWrapper>
<Routes>
<Route // Redirect to first tab if none specified
path="/rules/id/:detailName"
exact
render={({
match: {
params: { detailName },
},
location,
}) => (
<Redirect
to={{
...location,
pathname: `/rules/id/${detailName}/${RuleDetailTabs.alerts}`,
search: location.search,
}}
/>
)}
/>
<Route path="/rules" exact>
<Redirect to={`/rules/${AllRulesTabs.management}`} />
</Route>
{subRoutes}
<Route component={NotFoundPage} />
<SpyRoute pageName={SecurityPageName.rules} />
</Routes>
</PluginTemplateWrapper>
);
};
Expand All @@ -112,9 +131,7 @@ const Rules = React.memo(RulesContainerComponent);

const CoverageOverviewRoutes = () => (
<PluginTemplateWrapper>
<TrackApplicationView viewId={SecurityPageName.coverageOverview}>
<CoverageOverviewPage />
</TrackApplicationView>
<CoverageOverviewPage />
</PluginTemplateWrapper>
);

Expand All @@ -123,11 +140,15 @@ export const routes: SecuritySubPluginRoutes = [
path: RULES_LANDING_PATH,
component: withSecurityRoutePageWrapper(RulesLandingPage, SecurityPageName.rulesLanding, {
redirectOnMissing: true,
omitSpyRoute: true,
}),
},
{
path: RULES_PATH,
component: Rules,
component: withSecurityRoutePageWrapper(Rules, SecurityPageName.rules, {
redirectOnMissing: true,
omitSpyRoute: true,
}),
},
{
path: COVERAGE_OVERVIEW_PATH,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
ALERT_SUMMARY_URL,
ALERTS_URL,
MAINTENANCE_WINDOW_URL,
RULES_LANDING_URL,
RULES_URL,
STACK_RULES_URL,
} from '../../../urls/navigation';

Expand Down Expand Up @@ -98,7 +98,7 @@ describe('Capabilities', { tags: '@serverless' }, () => {
});

it('should redirect from rules to get started page', () => {
visit(RULES_LANDING_URL);
visit(RULES_URL);
cy.get(GET_STARTED_PAGE).should('exist');
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const CSP_BENCHMARKS_URL = '/app/security/cloud_security_posture/benchmar
export const CSP_DASHBOARD_URL = '/app/security/cloud_security_posture/dashboard';
export const CSP_FINDINGS_URL = '/app/security/cloud_security_posture/findings/configurations';

export const RULES_LANDING_URL = '/app/security/rules/landing';
export const RULES_URL = '/app/security/rules';
export const RULES_COVERAGE_URL = '/app/security/rules_coverage_overview';

export const HOSTS_URL = '/app/security/hosts/events';
Expand Down