Fixing pagerduty timestamp validation

elastic · Nov 12, 2020 · c144d02 · c144d02
1 parent 51567dc
commit c144d02
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.test.ts b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.test.ts
@@ -140,6 +140,40 @@ describe('validateParams()', () => {
     expect(validateParams(actionType, params)).toEqual(params);
   });
 
+  test('should validate and pass when params is valid and optional timestamp is empty string', () => {
+    expect(validateParams(actionType, {})).toEqual({});
+
+    const params = {
+      eventAction: 'trigger',
+      dedupKey: 'a dedupKey',
+      summary: 'a summary',
+      source: 'a source',
+      severity: 'critical',
+      timestamp: '',
+      component: 'a component',
+      group: 'a group',
+      class: 'a class',
+    };
+    expect(validateParams(actionType, params)).toEqual(params);
+  });
+
+  test('should validate and pass when params is valid and optional timestamp is null', () => {
+    expect(validateParams(actionType, {})).toEqual({});
+
+    const params = {
+      eventAction: 'trigger',
+      dedupKey: 'a dedupKey',
+      summary: 'a summary',
+      source: 'a source',
+      severity: 'critical',
+      timestamp: null,
+      component: 'a component',
+      group: 'a group',
+      class: 'a class',
+    };
+    expect(validateParams(actionType, params)).toEqual(params);
+  });
+
   test('should validate and throw error when params is invalid', () => {
     expect(() => {
       validateParams(actionType, { eventAction: 'ackynollage' });

diff --git a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts
@@ -86,7 +86,7 @@ const ParamsSchema = schema.object(
 
 function validateParams(paramsObject: unknown): string | void {
   const { timestamp, eventAction, dedupKey } = paramsObject as ActionParamsType;
-  if (timestamp != null) {
+  if (timestamp != null && timestamp.length > 0) {
     try {
       const date = Date.parse(timestamp);
       if (isNaN(date)) {