Skip to content
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

Jump to bottom

Add possibility to update threat_indicator_path for prebuilt rule #116583

Merged
merged 6 commits into from
Nov 29, 2021
Merged

Add possibility to update threat_indicator_path for prebuilt rule #116583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7402f22
Add possibility to update threat_indicator_path for prebuiltt rule
nkhristinin Oct 28, 2021
0ecc745
Fix types
nkhristinin Oct 28, 2021
0139b90
Merge branch 'main' into prebuilt-rule-update
kibanamachine Nov 16, 2021
b42844e
Merge branch 'main' into prebuilt-rule-update
kibanamachine Nov 24, 2021
962d0cb
Merge branch 'main' into prebuilt-rule-update
kibanamachine Nov 29, 2021
1c4f276
adds update_prepacked_rules test
Nov 29, 2021
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
1 change: 1 addition & 0 deletions .../plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ export const importRulesRoute = (
threshold,
threatFilters,
threatIndex,
threatIndicatorPath,
threatQuery,
threatMapping,
threatLanguage,
Expand Down
2 changes: 2 additions & 0 deletions ...gins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ export const patchRulesBulkRoute = (
threshold,
threat_filters: threatFilters,
threat_index: threatIndex,
threat_indicator_path: threatIndicatorPath,
threat_query: threatQuery,
threat_mapping: threatMapping,
threat_language: threatLanguage,
Expand Down Expand Up @@ -178,6 +179,7 @@ export const patchRulesBulkRoute = (
threshold,
threatFilters,
threatIndex,
threatIndicatorPath,
threatQuery,
threatMapping,
threatLanguage,
Expand Down
2 changes: 2 additions & 0 deletions ...k/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ export const patchRulesRoute = (
threshold,
threat_filters: threatFilters,
threat_index: threatIndex,
threat_indicator_path: threatIndicatorPath,
threat_query: threatQuery,
threat_mapping: threatMapping,
threat_language: threatLanguage,
Expand Down Expand Up @@ -179,6 +180,7 @@ export const patchRulesRoute = (
threshold,
threatFilters,
threatIndex,
threatIndicatorPath,
threatQuery,
threatMapping,
threatLanguage,
Expand Down
2 changes: 2 additions & 0 deletions x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.mock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export const getPatchRulesOptionsMock = (isRuleRegistryEnabled: boolean): PatchR
threshold: undefined,
threatFilters: undefined,
threatIndex: undefined,
threatIndicatorPath: undefined,
threatQuery: undefined,
threatMapping: undefined,
threatLanguage: undefined,
Expand Down Expand Up @@ -103,6 +104,7 @@ export const getPatchMlRulesOptionsMock = (isRuleRegistryEnabled: boolean): Patc
threshold: undefined,
threatFilters: undefined,
threatIndex: undefined,
threatIndicatorPath: undefined,
threatQuery: undefined,
threatMapping: undefined,
threatLanguage: undefined,
Expand Down
3 changes: 3 additions & 0 deletions x-pack/plugins/security_solution/server/lib/detection_engine/rules/patch_rules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export const patchRules = async ({
threshold,
threatFilters,
threatIndex,
threatIndicatorPath,
threatQuery,
threatMapping,
threatLanguage,
Expand Down Expand Up @@ -123,6 +124,7 @@ export const patchRules = async ({
threshold,
threatFilters,
threatIndex,
threatIndicatorPath,
threatQuery,
threatMapping,
threatLanguage,
Expand Down Expand Up @@ -170,6 +172,7 @@ export const patchRules = async ({
threshold: threshold ? normalizeThresholdObject(threshold) : undefined,
threatFilters,
threatIndex,
threatIndicatorPath,
threatQuery,
threatMapping,
threatLanguage,
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/security_solution/server/lib/detection_engine/rules/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ export interface PatchRulesOptions {
threshold: ThresholdOrUndefined;
threatFilters: ThreatFiltersOrUndefined;
threatIndex: ThreatIndexOrUndefined;
threatIndicatorPath: ThreatIndicatorPathOrUndefined;
threatQuery: ThreatQueryOrUndefined;
threatMapping: ThreatMappingOrUndefined;
threatLanguage: ThreatLanguageOrUndefined;
Expand Down
38 changes: 38 additions & 0 deletions ...lugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,42 @@ describe.each([
})
);
});

it('should update threat match rules', async () => {
const updatedThreatParams = {
threat_index: ['test-index'],
threat_indicator_path: 'test.path',
threat_query: 'threat:*',
};
const prepackagedRule = getAddPrepackagedRulesSchemaDecodedMock();
rulesClient.find.mockResolvedValue(getFindResultWithSingleHit(isRuleRegistryEnabled));

await updatePrepackagedRules(
rulesClient,
savedObjectsClient,
'default',
ruleStatusClient,
[{ ...prepackagedRule, ...updatedThreatParams }],
'output-index',
isRuleRegistryEnabled
);

expect(patchRules).toHaveBeenCalledWith(
expect.objectContaining({
threatIndicatorPath: 'test.path',
})
);

expect(patchRules).toHaveBeenCalledWith(
expect.objectContaining({
threatIndex: ['test-index'],
})
);

expect(patchRules).toHaveBeenCalledWith(
expect.objectContaining({
threatQuery: 'threat:*',
})
);
});
});
2 changes: 2 additions & 0 deletions x-pack/plugins/security_solution/server/lib/detection_engine/rules/update_prepacked_rules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ export const createPromises = (
threshold,
threat_filters: threatFilters,
threat_index: threatIndex,
threat_indicator_path: threatIndicatorPath,
threat_query: threatQuery,
threat_mapping: threatMapping,
threat_language: threatLanguage,
Expand Down Expand Up @@ -195,6 +196,7 @@ export const createPromises = (
threshold,
threatFilters,
threatIndex,
threatIndicatorPath,
threatQuery,
threatMapping,
threatLanguage,
Expand Down
3 changes: 3 additions & 0 deletions x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ describe('utils', () => {
threshold: undefined,
threatFilters: undefined,
threatIndex: undefined,
threatIndicatorPath: undefined,
threatQuery: undefined,
threatMapping: undefined,
threatLanguage: undefined,
Expand Down Expand Up @@ -126,6 +127,7 @@ describe('utils', () => {
threshold: undefined,
threatFilters: undefined,
threatIndex: undefined,
threatIndicatorPath: undefined,
threatQuery: undefined,
threatMapping: undefined,
threatLanguage: undefined,
Expand Down Expand Up @@ -177,6 +179,7 @@ describe('utils', () => {
threshold: undefined,
threatFilters: undefined,
threatIndex: undefined,
threatIndicatorPath: undefined,
threatQuery: undefined,
threatMapping: undefined,
threatLanguage: undefined,
Expand Down
2 changes: 2 additions & 0 deletions x-pack/plugins/security_solution/server/lib/detection_engine/rules/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import type {
ItemsPerSearchOrUndefined,
ThreatFiltersOrUndefined,
ThreatIndexOrUndefined,
ThreatIndicatorPathOrUndefined,
ThreatLanguageOrUndefined,
ThreatMappingOrUndefined,
ThreatQueryOrUndefined,
Expand Down Expand Up @@ -113,6 +114,7 @@ export interface UpdateProperties {
threshold: ThresholdOrUndefined;
threatFilters: ThreatFiltersOrUndefined;
threatIndex: ThreatIndexOrUndefined;
threatIndicatorPath: ThreatIndicatorPathOrUndefined;
threatQuery: ThreatQueryOrUndefined;
threatMapping: ThreatMappingOrUndefined;
threatLanguage: ThreatLanguageOrUndefined;
Expand Down