github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Defend workflows] Stop spreading whole request to ES dsl (#162116)

Browse source
This commit is contained in:
Tomasz Ciecierski 2023-07-19 09:58:45 +02:00 • committed by GitHub
parent c472fb018b
commit 9c7dda0b90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
x-pack/plugins/osquery/server/search_strategy/osquery/index.ts
View file

@ -39,7 +39,20 @@ export const osquerySearchStrategyProvider = <T extends FactoryQueryTypes>(
})
).pipe(
mergeMap((exists) => {
const dsl = queryFactory.buildDsl({ ...request, componentTemplateExists: exists });
const strictRequest = {
factoryQueryType: request.factoryQueryType,
filterQuery: request.filterQuery,
...('aggregations' in request ? { aggregations: request.aggregations } : {}),
...('pagination' in request ? { pagination: request.pagination } : {}),
...('sort' in request ? { sort: request.sort } : {}),
...('actionId' in request ? { actionId: request.actionId } : {}),
...('agentId' in request ? { agentId: request.agentId } : {}),
};
const dsl = queryFactory.buildDsl({
...strictRequest,
componentTemplateExists: exists,
} as StrategyRequestType<T>);
// use internal user for searching .fleet* indices
es =
dsl.index?.includes('fleet') || dsl.index?.includes('logs-osquery_manager.action')
@ -48,7 +61,7 @@ export const osquerySearchStrategyProvider = <T extends FactoryQueryTypes>(
return es.search(
{
...request,
...strictRequest,
params: dsl,
},
options,