Skip to content

[8.18] [Security Solution] Fix inconsistent rule's modified status after applying bulk actions (#214115) #214151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kibanamachine merged 1 commit into from
Mar 12, 2025
Merged

[8.18] [Security Solution] Fix inconsistent rule's modified status after applying bulk actions (#214115) #214151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...olution/public/detection_engine/rule_management_ui/components/rules_table/use_columns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ const INTEGRATIONS_COLUMN: TableColumn = {

return <IntegrationsPopover relatedIntegrations={integrations} />;
},
width: '143px',
width: '70px',
truncateText: true,
};

Expand Down Expand Up @@ -258,7 +258,7 @@ const MODIFIED_COLUMN: TableColumn = {
</EuiToolTip>
);
},
width: '70px',
width: '90px',
truncateText: true,
};

Expand Down
17 changes: 13 additions & 4 deletions ...olution/server/lib/detection_engine/rule_management/logic/bulk_actions/bulk_edit_rules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { ruleParamsModifier } from './rule_params_modifier';
import { splitBulkEditActions } from './split_bulk_edit_actions';
import { validateBulkEditRule } from './validations';
import type { PrebuiltRulesCustomizationStatus } from '../../../../../../common/detection_engine/prebuilt_rules/prebuilt_rule_customization_status';
import { invariant } from '../../../../../../common/utils/invariant';

export interface BulkEditRulesArguments {
actionsClient: ActionsClient;
Expand Down Expand Up @@ -66,12 +67,15 @@ export const bulkEditRules = async ({
const baseVersionsMap = new Map(
baseVersions.map((baseVersion) => [baseVersion.rule_id, baseVersion])
);
const currentRulesMap = new Map(rules.map((rule) => [rule.id, rule]));

const result = await rulesClient.bulkEdit<RuleParams>({
ids: rules.map((rule) => rule.id),
ids: Array.from(currentRulesMap.keys()),
operations,
paramsModifier: async (currentRule) => {
const ruleParams = currentRule.params;
// Rules Client applies operations to rules client aware fields like tags
// the rule before passing it to paramsModifier().
paramsModifier: async (partiallyModifiedRule) => {
const ruleParams = partiallyModifiedRule.params;

await validateBulkEditRule({
mlAuthz,
Expand All @@ -80,13 +84,18 @@ export const bulkEditRules = async ({
immutable: ruleParams.immutable,
ruleCustomizationStatus,
});

const currentRule = currentRulesMap.get(partiallyModifiedRule.id);

invariant(currentRule, "Unable to extract rule's current data in paramsModifier");

const { modifiedParams, isParamsUpdateSkipped } = ruleParamsModifier(
ruleParams,
paramsActions
);

const nextRule = convertAlertingRuleToRuleResponse({
...currentRule,
...partiallyModifiedRule,
params: modifiedParams,
});

Expand Down