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

Avoid mutating KQL query when validating it #97081

Merged
merged 4 commits into from
Apr 18, 2021
Merged

Avoid mutating KQL query when validating it #97081

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
521d6a7
Avoid mutating KQL query when validating it
pgayvallet Apr 14, 2021
6364229
Merge remote-tracking branch 'upstream/master' into kbn-95784-mutatin…
pgayvallet Apr 16, 2021
fed711d
Merge remote-tracking branch 'upstream/master' into kbn-95784-mutatin…
pgayvallet Apr 17, 2021
ec864c1
Merge remote-tracking branch 'upstream/master' into kbn-95784-mutatin…
pgayvallet Apr 18, 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
17 changes: 17 additions & 0 deletions src/core/server/saved_objects/service/lib/filter_utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Side Public License, v 1.
*/

import { cloneDeep } from 'lodash';
// @ts-expect-error no ts
import { esKuery } from '../../es_query';

Expand Down Expand Up @@ -105,6 +106,22 @@ describe('Filter Utils', () => {
)
).toEqual(esKuery.fromKueryExpression('foo.title: "best"'));
});

test('does not mutate the input KueryNode', () => {
const input = esKuery.nodeTypes.function.buildNode(
'is',
`foo.attributes.title`,
'best',
true
);

const inputCopy = cloneDeep(input);

validateConvertFilterToKueryNode(['foo'], input, mockMappings);

expect(input).toEqual(inputCopy);
});

test('Validate a simple KQL expression filter', () => {
expect(
validateConvertFilterToKueryNode(['foo'], 'foo.attributes.title: "best"', mockMappings)
Expand Down
5 changes: 3 additions & 2 deletions src/core/server/saved_objects/service/lib/filter_utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
*/

import { set } from '@elastic/safer-lodash-set';
import { get } from 'lodash';
import { get, cloneDeep } from 'lodash';
import { SavedObjectsErrorHelpers } from './errors';
import { IndexMapping } from '../../mappings';
// @ts-expect-error no ts
import { esKuery } from '../../es_query';

type KueryNode = any;

const astFunctionType = ['is', 'range', 'nested'];
Expand All @@ -23,7 +24,7 @@ export const validateConvertFilterToKueryNode = (
): KueryNode | undefined => {
if (filter && indexMapping) {
const filterKueryNode =
typeof filter === 'string' ? esKuery.fromKueryExpression(filter) : filter;
typeof filter === 'string' ? esKuery.fromKueryExpression(filter) : cloneDeep(filter);

const validationFilterKuery = validateFilterKueryNode({
astFilter: filterKueryNode,
Expand Down