github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-11-24 18:56:32 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix(media config): expect HD_MEDIA_BACKEND_S3_ENDPOINT to be an uri

Browse source 
Signed-off-by: Tilman Vatteroth <git@tilmanvatteroth.de>
This commit is contained in:
Tilman Vatteroth 2023-04-14 18:04:56 +02:00
parent 3c2f59c382
commit baaa41b1e5
2 changed files with 44 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
backend/src/config/media.config.spec.ts
View file

@ -15,7 +15,7 @@ describe('mediaConfig', () => {
const accessKeyId = 'accessKeyId'; const accessKeyId = 'accessKeyId';
const secretAccessKey = 'secretAccessKey'; const secretAccessKey = 'secretAccessKey';
const bucket = 'bucket'; const bucket = 'bucket';
const endPoint = 'endPoint'; const endPoint = 'https://endPoint';
// Azure // Azure
const azureConnectionString = 'connectionString'; const azureConnectionString = 'connectionString';
const container = 'container'; const container = 'container';
@ -231,6 +231,46 @@ describe('mediaConfig', () => {
); );
restore(); restore();
}); });
it('when HD_MEDIA_BACKEND_S3_ENDPOINT is not an URI', async () => {
const restore = mockedEnv(
{
/* eslint-disable @typescript-eslint/naming-convention */
HD_MEDIA_BACKEND: BackendType.S3,
HD_MEDIA_BACKEND_S3_ACCESS_KEY: accessKeyId,
HD_MEDIA_BACKEND_S3_SECRET_KEY: secretAccessKey,
HD_MEDIA_BACKEND_S3_BUCKET: bucket,
HD_MEDIA_BACKEND_S3_ENDPOINT: 'wrong-uri',
/* eslint-enable @typescript-eslint/naming-convention */
},
{
clear: true,
},
);
expect(() => mediaConfig()).toThrow(
'"HD_MEDIA_BACKEND_S3_ENDPOINT" must be a valid uri with a scheme matching the ^https? pattern',
);
restore();
});
it('when HD_MEDIA_BACKEND_S3_ENDPOINT is an URI with a non-http(s) protocol', async () => {
const restore = mockedEnv(
{
/* eslint-disable @typescript-eslint/naming-convention */
HD_MEDIA_BACKEND: BackendType.S3,
HD_MEDIA_BACKEND_S3_ACCESS_KEY: accessKeyId,
HD_MEDIA_BACKEND_S3_SECRET_KEY: secretAccessKey,
HD_MEDIA_BACKEND_S3_BUCKET: bucket,
HD_MEDIA_BACKEND_S3_ENDPOINT: 'ftps://example.org',
/* eslint-enable @typescript-eslint/naming-convention */
},
{
clear: true,
},
);
expect(() => mediaConfig()).toThrow(
'"HD_MEDIA_BACKEND_S3_ENDPOINT" must be a valid uri with a scheme matching the ^https? pattern',
);
restore();
});
}); });
describe('for backend azure', () => { describe('for backend azure', () => {

4
backend/src/config/media.config.ts
View file

@ -56,7 +56,9 @@ const mediaSchema = Joi.object({
accessKeyId: Joi.string().label('HD_MEDIA_BACKEND_S3_ACCESS_KEY'), accessKeyId: Joi.string().label('HD_MEDIA_BACKEND_S3_ACCESS_KEY'),
secretAccessKey: Joi.string().label('HD_MEDIA_BACKEND_S3_SECRET_KEY'), secretAccessKey: Joi.string().label('HD_MEDIA_BACKEND_S3_SECRET_KEY'),
bucket: Joi.string().label('HD_MEDIA_BACKEND_S3_BUCKET'), bucket: Joi.string().label('HD_MEDIA_BACKEND_S3_BUCKET'),
endPoint: Joi.string().uri().label('HD_MEDIA_BACKEND_S3_ENDPOINT'), endPoint: Joi.string()
.uri({ scheme: /^https?/ })
.label('HD_MEDIA_BACKEND_S3_ENDPOINT'),
}), }),
otherwise: Joi.optional(), otherwise: Joi.optional(),
}), }),