maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Loosen UUID regex to accept uuidv1 or uuidv4 (#85338)

Browse source
This commit is contained in:
Marshall Main 2020-12-08 18:14:48 -05:00 committed by GitHub
parent 8c8e96ff88
commit 4b4419a930
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.test.tsx
View file

@ -5,7 +5,7 @@
*/
import { validateSingleAction, validateRuleActionsField } from './schema';
import { isUuidv4, getActionTypeName, validateMustache, validateActionParams } from './utils';
import { isUuid, getActionTypeName, validateMustache, validateActionParams } from './utils';
import { actionTypeRegistryMock } from '../../../../../../triggers_actions_ui/public/application/action_type_registry.mock';
import { FormHook } from '../../../../shared_imports';
jest.mock('./utils');
@ -15,7 +15,7 @@ describe('stepRuleActions schema', () => {
describe('validateSingleAction', () => {
it('should validate single action', () => {
(isUuidv4 as jest.Mock).mockReturnValue(true);
(isUuid as jest.Mock).mockReturnValue(true);
(validateActionParams as jest.Mock).mockReturnValue([]);
(validateMustache as jest.Mock).mockReturnValue([]);
@ -33,7 +33,7 @@ describe('stepRuleActions schema', () => {
});
it('should validate single action with invalid mustache template', () => {
(isUuidv4 as jest.Mock).mockReturnValue(true);
(isUuid as jest.Mock).mockReturnValue(true);
(validateActionParams as jest.Mock).mockReturnValue([]);
(validateMustache as jest.Mock).mockReturnValue(['Message is not valid mustache template']);
@ -54,7 +54,7 @@ describe('stepRuleActions schema', () => {
});
it('should validate single action with incorrect id', () => {
(isUuidv4 as jest.Mock).mockReturnValue(false);
(isUuid as jest.Mock).mockReturnValue(false);
(validateMustache as jest.Mock).mockReturnValue([]);
(validateActionParams as jest.Mock).mockReturnValue([]);
@ -117,9 +117,9 @@ describe('stepRuleActions schema', () => {
});
it('should validate multiple incorrect rule actions field', () => {
(isUuidv4 as jest.Mock).mockReturnValueOnce(false);
(isUuid as jest.Mock).mockReturnValueOnce(false);
(getActionTypeName as jest.Mock).mockReturnValueOnce('Slack');
(isUuidv4 as jest.Mock).mockReturnValueOnce(true);
(isUuid as jest.Mock).mockReturnValueOnce(true);
(getActionTypeName as jest.Mock).mockReturnValueOnce('Pagerduty');
(validateActionParams as jest.Mock).mockReturnValue(['Summary is required']);
(validateMustache as jest.Mock).mockReturnValue(['Component is not valid mustache template']);

4
x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/schema.tsx
View file

@ -15,13 +15,13 @@ import {
import { FormSchema, ValidationFunc, ERROR_CODE } from '../../../../shared_imports';
import { ActionsStepRule } from '../../../pages/detection_engine/rules/types';
import * as I18n from './translations';
import { isUuidv4, getActionTypeName, validateMustache, validateActionParams } from './utils';
import { isUuid, getActionTypeName, validateMustache, validateActionParams } from './utils';
export const validateSingleAction = (
actionItem: AlertAction,
actionTypeRegistry: ActionTypeRegistryContract
): string[] => {
if (!isUuidv4(actionItem.id)) {
if (!isUuid(actionItem.id)) {
return [I18n.NO_CONNECTOR_SELECTED];
}

6
x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.test.ts
View file

@ -5,16 +5,16 @@
*/
import { actionTypeRegistryMock } from '../../../../../../triggers_actions_ui/public/application/action_type_registry.mock';
import { isUuidv4, getActionTypeName, validateMustache, validateActionParams } from './utils';
import { isUuid, getActionTypeName, validateMustache, validateActionParams } from './utils';
describe('stepRuleActions utils', () => {
describe('isUuidv4', () => {
it('should validate proper uuid v4 value', () => {
expect(isUuidv4('817b8bca-91d1-4729-8ee1-3a83aaafd9d4')).toEqual(true);
expect(isUuid('817b8bca-91d1-4729-8ee1-3a83aaafd9d4')).toEqual(true);
});
it('should validate incorrect uuid v4 value', () => {
expect(isUuidv4('ad9d4')).toEqual(false);
expect(isUuid('ad9d4')).toEqual(false);
});
});

4
x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/utils.ts
View file

@ -13,9 +13,9 @@ import {
} from '../../../../../../triggers_actions_ui/public';
import * as I18n from './translations';
const UUID_V4_REGEX = /^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i;
const UUID_REGEX = /^[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}$/i;
export const isUuidv4 = (id: AlertAction['id']) => !!id.match(UUID_V4_REGEX);
export const isUuid = (id: AlertAction['id']) => !!id.match(UUID_REGEX);
export const getActionTypeName = (actionTypeId: AlertAction['actionTypeId']) => {
if (!actionTypeId) return '';