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

[7.x] [Security Solution] [Detections] Fixes bug for determining when we hit max signals after filtering with lists (#71768) #71800

Merged
merged 3 commits into from
Jul 15, 2020
Merged

[7.x] [Security Solution] [Detections] Fixes bug for determining when we hit max signals after filtering with lists (#71768) #71800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4217e2a
[Security Solution] [Detections] Fixes bug for determining when we hi…
dhurley14 Jul 15, 2020
8ef01fe
Merge branch '7.x' into backport/7.x/pr-71768
elasticmachine Jul 15, 2020
3f002f5
Merge branch '7.x' into backport/7.x/pr-71768
elasticmachine Jul 15, 2020
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: 0 additions & 1 deletion .../plugins/security_solution/server/lib/detection_engine/signals/filter_events_with_list.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export const filterEventsAgainstList = async ({
buildRuleMessage,
}: FilterEventsAgainstList): Promise<SignalSearchResponse> => {
try {
logger.debug(buildRuleMessage(`exceptionsList: ${JSON.stringify(exceptionsList, null, 2)}`));
if (exceptionsList == null || exceptionsList.length === 0) {
logger.debug(buildRuleMessage('about to return original search result'));
return eventSearchResult;
Expand Down
16 changes: 12 additions & 4 deletions ...plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export const searchAfterAndBulkCreate = async ({
};

let sortId; // tells us where to start our next search_after query
let searchResultSize = 0;
let signalsCreatedCount = 0;

/*
The purpose of `maxResults` is to ensure we do not perform
Expand Down Expand Up @@ -127,8 +127,8 @@ export const searchAfterAndBulkCreate = async ({
toReturn.success = false;
return toReturn;
}
searchResultSize = 0;
while (searchResultSize < tuple.maxSignals) {
signalsCreatedCount = 0;
while (signalsCreatedCount < tuple.maxSignals) {
try {
logger.debug(buildRuleMessage(`sortIds: ${sortId}`));
const {
Expand Down Expand Up @@ -167,7 +167,6 @@ export const searchAfterAndBulkCreate = async ({
searchResult.hits.hits[searchResult.hits.hits.length - 1]?._source['@timestamp']
)
: null;
searchResultSize += searchResult.hits.hits.length;

// filter out the search results that match with the values found in the list.
// the resulting set are valid signals that are not on the allowlist.
Expand All @@ -187,6 +186,14 @@ export const searchAfterAndBulkCreate = async ({
break;
}

// make sure we are not going to create more signals than maxSignals allows
if (signalsCreatedCount + filteredEvents.hits.hits.length > tuple.maxSignals) {
filteredEvents.hits.hits = filteredEvents.hits.hits.slice(
0,
tuple.maxSignals - signalsCreatedCount
);
}

const {
bulkCreateDuration: bulkDuration,
createdItemsCount: createdCount,
Expand All @@ -211,6 +218,7 @@ export const searchAfterAndBulkCreate = async ({
});
logger.debug(buildRuleMessage(`created ${createdCount} signals`));
toReturn.createdSignalsCount += createdCount;
signalsCreatedCount += createdCount;
if (bulkDuration) {
toReturn.bulkCreateTimes.push(bulkDuration);
}
Expand Down