Skip to content

Free, Open Source, Self-Hosted WhatsApp API Gateway

fix(dto): ignore an empty url next to base64 on status and convert

Yudhi Armyndharis579b0888ac5a
diff --git a/src/modules/media/dto/convert-media.dto.spec.ts b/src/modules/media/dto/convert-media.dto.spec.ts
index b3a9c338c..b6c2ce1f1 100644
--- a/src/modules/media/dto/convert-media.dto.spec.ts
+++ b/src/modules/media/dto/convert-media.dto.spec.ts
@@ -29,6 +29,14 @@ describe('ConvertMediaDto url', () => {
expect(await validateDto({ base64: 'AAAA', url: 'junk' })).toHaveLength(0);
});
+ it('ignores an empty url next to base64, which wins', async () => {
+ expect(await validateDto({ base64: 'AAAA', url: '' })).toHaveLength(0);
+ });
+
+ it('refuses an empty url without base64', async () => {
+ expect((await validateDto({ url: '' })).map(e => e.property)).toContain('url');
+ });
+
it('checks the url when base64 is only a data-URI prefix', async () => {
const errors = await validateDto({ base64: 'data:audio/mpeg;base64,', url: 'cdn/a.mp3' });
expect(errors.map(e => e.property)).toContain('url');
diff --git a/src/modules/media/dto/convert-media.dto.ts b/src/modules/media/dto/convert-media.dto.ts
index a76f58ddc..a566bc073 100644
--- a/src/modules/media/dto/convert-media.dto.ts
+++ b/src/modules/media/dto/convert-media.dto.ts
@@ -19,7 +19,6 @@ export class ConvertMediaDto {
@ValidateIf((dto: ConvertMediaDto) => dto.base64 === undefined || dto.url !== undefined)
@ToStrictString()
@IsString()
- @IsNotEmpty()
// Same rule as every send DTO: base64 wins when it holds data, so a url next to it is not fetched.
@IsMediaUrl<ConvertMediaDto>({ ignoreWhen: o => !!stripBase64DataUri(o.base64) })
url?: string;
diff --git a/src/modules/status/dto/send-media-status.dto.spec.ts b/src/modules/status/dto/send-media-status.dto.spec.ts
index 3190b2bd9..1b0c4f68f 100644
--- a/src/modules/status/dto/send-media-status.dto.spec.ts
+++ b/src/modules/status/dto/send-media-status.dto.spec.ts
@@ -1,4 +1,6 @@
import 'reflect-metadata';
+import { BadRequestException, ValidationPipe } from '@nestjs/common';
+import { GLOBAL_VALIDATION_OPTIONS } from '../../../config/app-validation';
import { plainToInstance } from 'class-transformer';
import { validate } from 'class-validator';
import { SendImageStatusDto, SendVideoStatusDto, SendVoiceStatusDto } from './send-media-status.dto';
@@ -133,3 +135,33 @@ describe('status media url', () => {
expect(refused.some(e => e.property === 'image')).toBe(true);
});
});
+
+describe('status media precedence through the global validation options', () => {
+ const pipe = new ValidationPipe(GLOBAL_VALIDATION_OPTIONS);
+
+ it.each([
+ ['image', SendImageStatusDto],
+ ['video', SendVideoStatusDto],
+ ['audio', SendVoiceStatusDto],
+ ] as const)('%s ignores an empty unused URL and validates the selected source', async (key, Dto) => {
+ const through = (media: unknown) => pipe.transform({ [key]: media }, { type: 'body', metatype: Dto });
+ for (const base64 of ['QUJD', 'data:image/png;base64,QUJD']) {
+ await expect(through({ base64, url: '', mimetype: 'image/png' })).resolves.toBeDefined();
+ await expect(through({ base64, url: 'unused/path', mimetype: 'image/png' })).resolves.toBeDefined();
+ }
+ await expect(through({ url: 'https://example.com/media' })).resolves.toBeDefined();
+ for (const media of [
+ {},
+ { url: '' },
+ { url: 'unused/path' },
+ { base64: 'data:image/png;base64,', url: 'unused/path' },
+ { base64: 'QUJD', url: null },
+ { base64: 'QUJD', url: {} },
+ { base64: 'QUJD', url: false },
+ { base64: [] },
+ { base64: {} },
+ ]) {
+ await expect(through(media)).rejects.toBeInstanceOf(BadRequestException);
+ }
+ });
+});
diff --git a/src/modules/status/dto/send-media-status.dto.ts b/src/modules/status/dto/send-media-status.dto.ts
index 855e34b6c..8d033b7be 100644
--- a/src/modules/status/dto/send-media-status.dto.ts
+++ b/src/modules/status/dto/send-media-status.dto.ts
@@ -25,7 +25,6 @@ class StatusMediaInput {
@ValidateIf((media: StatusMediaInput) => media.base64 === undefined || media.url !== undefined)
@ToStrictString()
@IsString()
- @IsNotEmpty()
// base64 wins when both are sent, so a url next to it is not fetched and not checked; a base64 that is
// only a data-URI prefix strips to nothing, and then the url is what gets sent.
@IsMediaUrl<StatusMediaInput>({ ignoreWhen: media => !!stripBase64DataUri(media.base64) })