X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Foembed.ts;h=ef9a227a0446a1513727858624dcea3e404765a8;hb=a2be43f5700460d3afdc194abc788690b79e66cd;hp=fc1a294e0898ef56cac18ef8970579996f9e3760;hpb=b3d9dedcc36a333bae0bafe92eeede1a11796ce7;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/oembed.ts b/server/middlewares/validators/oembed.ts index fc1a294e0..ef9a227a0 100644 --- a/server/middlewares/validators/oembed.ts +++ b/server/middlewares/validators/oembed.ts @@ -5,9 +5,8 @@ import { loadVideo } from '@server/lib/model-loaders' import { VideoPlaylistModel } from '@server/models/video/video-playlist' import { VideoPlaylistPrivacy, VideoPrivacy } from '@shared/models' import { HttpStatusCode } from '../../../shared/models/http/http-error-codes' -import { isTestInstance } from '../../helpers/core-utils' +import { isTestOrDevInstance } from '../../helpers/core-utils' import { isIdOrUUIDValid, isUUIDValid, toCompleteUUID } from '../../helpers/custom-validators/misc' -import { logger } from '../../helpers/logger' import { WEBSERVER } from '../../initializers/constants' import { areValidationErrors } from './shared' @@ -34,19 +33,24 @@ const isURLOptions = { } // We validate 'localhost', so we don't have the top level domain -if (isTestInstance()) { +if (isTestOrDevInstance()) { isURLOptions.require_tld = false } const oembedValidator = [ - query('url').isURL(isURLOptions).withMessage('Should have a valid url'), - query('maxwidth').optional().isInt().withMessage('Should have a valid max width'), - query('maxheight').optional().isInt().withMessage('Should have a valid max height'), - query('format').optional().isIn([ 'xml', 'json' ]).withMessage('Should have a valid format'), + query('url') + .isURL(isURLOptions), + query('maxwidth') + .optional() + .isInt(), + query('maxheight') + .optional() + .isInt(), + query('format') + .optional() + .isIn([ 'xml', 'json' ]), async (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking oembed parameters', { parameters: req.query }) - if (areValidationErrors(req, res)) return if (req.query.format !== undefined && req.query.format !== 'json') {