github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[SIEM][Detection Engine] critical blocker with the UI crashing

Browse source 
## Summary

If you have filters which do not have a $app and state it blows up which isn't what we want to happen. This adds a function which default adds it on the UI if it does not exist

<img width="915" alt="Screen Shot 2020-01-28 at 10 07 39 AM" src="https://user-images.githubusercontent.com/1151048/73296325-bd17b900-41c6-11ea-9ba4-30715224829c.png">

Test:

Post query with everything

```ts
./post_rule.sh ./rules/queries/query_with_everything.json
```

Then visit in the details section of the UI and it should no longer blow up.

### Checklist

Use ~~strikethroughs~~ to remove checklist items you don't feel are applicable to this PR.

~~- [ ] This was checked for cross-browser compatibility, [including a check against IE11](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility)~~

~~- [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/master/packages/kbn-i18n/README.md)~~

~~- [ ] [Documentation](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#writing-documentation) was added for features that require explanation or tutorials~~

- [x] [Unit or functional tests](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility) were updated or added to match the most common scenarios

~~- [ ] This was checked for [keyboard-only and screenreader accessibility](https://developer.mozilla.org/en-US/docs/Learn/Tools_and_testing/Cross_browser_testing/Accessibility#Accessibility_testing_checklist)~~

### For maintainers

~~- [ ] This was checked for breaking API changes and was [labeled appropriately](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#release-notes-process)~~

- [x] This includes a feature addition or change that requires a release note and was [labeled appropriately](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#release-notes-process)
This commit is contained in:
Frank Hassanabad 2020-01-28 15:07:24 -07:00 • committed by GitHub
parent 597e7ea64b
commit 57f5d77a40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 196 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

185
x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.test.tsx Normal file
View file

@ -0,0 +1,185 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import { addFilterStateIfNotThere } from './';
import { esFilters } from '../../../../../../../../../../src/plugins/data/public';
describe('description_step', () => {
describe('addFilterStateIfNotThere', () => {
test('it does not change the state if it is global', () => {
const filters: esFilters.Filter[] = [
{
$state: {
store: esFilters.FilterStateStore.GLOBAL_STATE,
},
meta: {
alias: null,
disabled: false,
key: 'event.category',
negate: false,
params: {
query: 'file',
},
type: 'phrase',
},
query: {
match_phrase: {
'event.category': 'file',
},
},
},
{
$state: {
store: esFilters.FilterStateStore.GLOBAL_STATE,
},
meta: {
alias: null,
disabled: false,
key: 'event.category',
negate: false,
params: {
query: 'file',
},
type: 'phrase',
},
query: {
match_phrase: {
'event.category': 'file',
},
},
},
];
const output = addFilterStateIfNotThere(filters);
const expected: esFilters.Filter[] = [
{
$state: {
store: esFilters.FilterStateStore.GLOBAL_STATE,
},
meta: {
alias: null,
disabled: false,
key: 'event.category',
negate: false,
params: {
query: 'file',
},
type: 'phrase',
},
query: {
match_phrase: {
'event.category': 'file',
},
},
},
{
$state: {
store: esFilters.FilterStateStore.GLOBAL_STATE,
},
meta: {
alias: null,
disabled: false,
key: 'event.category',
negate: false,
params: {
query: 'file',
},
type: 'phrase',
},
query: {
match_phrase: {
'event.category': 'file',
},
},
},
];
expect(output).toEqual(expected);
});
test('it adds the state if it does not exist as local', () => {
const filters: esFilters.Filter[] = [
{
meta: {
alias: null,
disabled: false,
key: 'event.category',
negate: false,
params: {
query: 'file',
},
type: 'phrase',
},
query: {
match_phrase: {
'event.category': 'file',
},
},
},
{
meta: {
alias: null,
disabled: false,
key: 'event.category',
negate: false,
params: {
query: 'file',
},
type: 'phrase',
},
query: {
match_phrase: {
'event.category': 'file',
},
},
},
];
const output = addFilterStateIfNotThere(filters);
const expected: esFilters.Filter[] = [
{
$state: {
store: esFilters.FilterStateStore.APP_STATE,
},
meta: {
alias: null,
disabled: false,
key: 'event.category',
negate: false,
params: {
query: 'file',
},
type: 'phrase',
},
query: {
match_phrase: {
'event.category': 'file',
},
},
},
{
$state: {
store: esFilters.FilterStateStore.APP_STATE,
},
meta: {
alias: null,
disabled: false,
key: 'event.category',
negate: false,
params: {
query: 'file',
},
type: 'phrase',
},
query: {
match_phrase: {
'event.category': 'file',
},
},
},
];
expect(output).toEqual(expected);
});
});
});

12
x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
View file

@ -97,6 +97,16 @@ const buildListItems = (
[]
);
export const addFilterStateIfNotThere = (filters: esFilters.Filter[]): esFilters.Filter[] => {
return filters.map(filter => {
if (filter.$state == null) {
return { $state: { store: esFilters.FilterStateStore.APP_STATE }, ...filter };
} else {
return filter;
}
});
};
const getDescriptionItem = (
field: string,
label: string,
@ -105,7 +115,7 @@ const getDescriptionItem = (
indexPatterns?: IIndexPattern
): ListItems[] => {
if (field === 'queryBar') {
const filters = get('queryBar.filters', value) as esFilters.Filter[];
const filters = addFilterStateIfNotThere(get('queryBar.filters', value));
const query = get('queryBar.query', value) as Query;
const savedId = get('queryBar.saved_id', value);
return buildQueryBarDescription({