NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2025-07-16 12:12:55 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

basic regex for url

Browse Source
This commit is contained in:
Cleber Wilson 2025-03-06 16:17:42 -03:00
parent 427c994993
commit 22a958616d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/integrations/event/webhook/webhook.controller.ts
View File

@ -6,7 +6,6 @@ import { configService, Log, Webhook } from '@config/env.config';
import { Logger } from '@config/logger.config'; import { Logger } from '@config/logger.config';
import { BadRequestException } from '@exceptions'; import { BadRequestException } from '@exceptions';
import axios, { AxiosInstance } from 'axios'; import axios, { AxiosInstance } from 'axios';
import { isURL } from 'class-validator';
import { EmitData, EventController, EventControllerInterface } from '../event.controller'; import { EmitData, EventController, EventControllerInterface } from '../event.controller';
@ -18,7 +17,7 @@ export class WebhookController extends EventController implements EventControlle
} }
override async set(instanceName: string, data: EventDto): Promise<wa.LocalWebHook> { override async set(instanceName: string, data: EventDto): Promise<wa.LocalWebHook> {
if (!isURL(data.webhook.url, { require_tld: false })) { if (!/^(https?:\/\/)/.test(data.webhook.url)) {
throw new BadRequestException('Invalid "url" property'); throw new BadRequestException('Invalid "url" property');
} }
@ -78,6 +77,7 @@ export class WebhookController extends EventController implements EventControlle
const we = event.replace(/[.-]/gm, '_').toUpperCase(); const we = event.replace(/[.-]/gm, '_').toUpperCase();
const transformedWe = we.replace(/_/gm, '-').toLowerCase(); const transformedWe = we.replace(/_/gm, '-').toLowerCase();
const enabledLog = configService.get<Log>('LOG').LEVEL.includes('WEBHOOKS'); const enabledLog = configService.get<Log>('LOG').LEVEL.includes('WEBHOOKS');
const regex = /^(https?:\/\/)/;
const webhookData = { const webhookData = {
event, event,
@ -111,7 +111,7 @@ export class WebhookController extends EventController implements EventControlle
} }
try { try {
if (instance?.enabled && isURL(instance.url, { require_tld: false })) { if (instance?.enabled && regex.test(instance.url)) {
const httpService = axios.create({ const httpService = axios.create({
baseURL, baseURL,
headers: webhookHeaders as Record<string, string> | undefined, headers: webhookHeaders as Record<string, string> | undefined,
@ -155,7 +155,7 @@ export class WebhookController extends EventController implements EventControlle
} }
try { try {
if (isURL(globalURL)) { if (regex.test(globalURL)) {
const httpService = axios.create({ baseURL: globalURL }); const httpService = axios.create({ baseURL: globalURL });
await this.retryWebhookRequest( await this.retryWebhookRequest(