Fixed due to comments

YulNaumenko · YulNaumenko · commit e725ed940ea3 · 2020-06-30T09:35:59.000-07:00
diff --git a/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts b/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts
@@ -114,6 +114,17 @@ describe('config validation', () => {
     });
   });
 
+  test('config validation failed when a url is invalid', () => {
+    const config: Record<string, string> = {
+      url: 'example.com/do-something',
+    };
+    expect(() => {
+      validateConfig(actionType, config);
+    }).toThrowErrorMatchingInlineSnapshot(
+      '"error validating action type config: error configuring webhook action: unable to parse host name from Url"'
+    );
+  });
+
   test('config validation passes when valid headers are provided', () => {
     // any for testing
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/x-pack/plugins/actions/server/builtin_action_types/webhook.ts b/x-pack/plugins/actions/server/builtin_action_types/webhook.ts
@@ -85,6 +85,15 @@ function validateActionTypeConfig(
   configurationUtilities: ActionsConfigurationUtilities,
   configObject: ActionTypeConfigType
 ) {
+  let url: URL;
+  try {
+    url = new URL(configObject.url);
+  } catch (err) {
+    return i18n.translate('xpack.actions.builtin.webhook.webhookConfigurationErrorNoHostname', {
+      defaultMessage: 'error configuring webhook action: unable to parse host name from Url',
+    });
+  }
+
   try {
     configurationUtilities.ensureWhitelistedUri(configObject.url);
   } catch (whitelistError) {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook.tsx
@@ -7,7 +7,7 @@ import { lazy } from 'react';
 import { i18n } from '@kbn/i18n';
 import { ActionTypeModel, ValidationResult } from '../../../../types';
 import { WebhookActionParams, WebhookActionConnector } from '../types';
-import { isUrlInvalid } from '../../../lib/value_validators';
+import { isValidUrl } from '../../../lib/value_validators';
 
 export function getActionType(): ActionTypeModel<WebhookActionConnector, WebhookActionParams> {
   return {
@@ -44,11 +44,11 @@ export function getActionType(): ActionTypeModel<WebhookActionConnector, Webhook
           )
         );
       }
-      if (isUrlInvalid(action.config.url)) {
+      if (action.config.url && !isValidUrl(action.config.url)) {
         errors.url = [
           ...errors.url,
           i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.servicenow.invalidApiUrlTextField',
+            'xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.error.invalidUrlTextField',
             {
               defaultMessage: 'URL is invalid.',
             }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/value_validators.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/value_validators.test.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { throwIfAbsent, throwIfIsntContained, isUrlInvalid } from './value_validators';
+import { throwIfAbsent, throwIfIsntContained, isValidUrl } from './value_validators';
 import uuid from 'uuid';
 
 describe('throwIfAbsent', () => {
@@ -80,12 +80,16 @@ describe('throwIfIsntContained', () => {
   });
 });
 
-describe('isUrlInvalid', () => {
+describe('isValidUrl', () => {
   test('verifies invalid url', () => {
-    expect(isUrlInvalid('this is not a url')).toBeTruthy();
+    expect(isValidUrl('this is not a url')).toBeFalsy();
   });
 
-  test('verifies valid url', () => {
-    expect(isUrlInvalid('https://www.elastic.co')).toBeFalsy();
+  test('verifies valid url any protocol', () => {
+    expect(isValidUrl('https://www.elastic.co/')).toBeTruthy();
+  });
+
+  test('verifies valid url with specific protocol', () => {
+    expect(isValidUrl('https://www.elastic.co/', 'https:')).toBeTruthy();
   });
 });
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/value_validators.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/value_validators.ts
@@ -32,11 +32,14 @@ export function throwIfIsntContained<T>(
   };
 }
 
-const urlExpression = /^https?:\/\/([\w\d\-]+\.)+\w{2,}(\/.+)?$/;
-
-export const isUrlInvalid = (url: string | null | undefined) => {
-  if (!isEmpty(url) && url != null && url.match(urlExpression) == null) {
-    return true;
+export const isValidUrl = (urlString: string, protocol?: string) => {
+  try {
+    const urlObject = new URL(urlString);
+    if (protocol === undefined || urlObject.protocol === protocol) {
+      return true;
+    }
+    return false;
+  } catch (err) {
+    return false;
   }
-  return false;
 };

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import { lazy } from 'react';`
`7`	`7`	`import { i18n } from '@kbn/i18n';`
`8`	`8`	`import { ActionTypeModel, ValidationResult } from '../../../../types';`
`9`	`9`	`import { WebhookActionParams, WebhookActionConnector } from '../types';`
`10`		`-import { isUrlInvalid } from '../../../lib/value_validators';`
	`10`	`+import { isValidUrl } from '../../../lib/value_validators';`
`11`	`11`
`12`	`12`	`export function getActionType(): ActionTypeModel<WebhookActionConnector, WebhookActionParams> {`
`13`	`13`	`return {`
`@@ -44,11 +44,11 @@ export function getActionType(): ActionTypeModel<WebhookActionConnector, Webhook`
`44`	`44`	`)`
`45`	`45`	`);`
`46`	`46`	`}`
`47`		`- if (isUrlInvalid(action.config.url)) {`
	`47`	`+ if (action.config.url && !isValidUrl(action.config.url)) {`
`48`	`48`	`errors.url = [`
`49`	`49`	`...errors.url,`
`50`	`50`	`i18n.translate(`
`51`		`- 'xpack.triggersActionsUI.components.builtinActionTypes.servicenow.invalidApiUrlTextField',`
	`51`	`+ 'xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.error.invalidUrlTextField',`
`52`	`52`	`{`
`53`	`53`	`defaultMessage: 'URL is invalid.',`
`54`	`54`	`}`