From a2431b7dcbc72c05101dcdbe631ff84a823aeb51 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 27 Nov 2017 17:30:46 +0100 Subject: Refractor validators --- server/middlewares/validators/videos.ts | 252 +++++++++++++++----------------- 1 file changed, 121 insertions(+), 131 deletions(-) (limited to 'server/middlewares/validators/videos.ts') diff --git a/server/middlewares/validators/videos.ts b/server/middlewares/validators/videos.ts index 5ffc85210..3cbf98312 100644 --- a/server/middlewares/validators/videos.ts +++ b/server/middlewares/validators/videos.ts @@ -3,11 +3,11 @@ import { body, param, query } from 'express-validator/check' import { UserRight, VideoPrivacy } from '../../../shared' import { isIdOrUUIDValid, isIdValid } from '../../helpers/custom-validators/misc' import { - checkVideoExists, isVideoAbuseReasonValid, isVideoCategoryValid, isVideoDescriptionValid, isVideoDurationValid, + isVideoExist, isVideoFile, isVideoLanguageValid, isVideoLicenceValid, @@ -20,12 +20,11 @@ import { import { getDurationFromVideoFile } from '../../helpers/ffmpeg-utils' import { logger } from '../../helpers/logger' import { CONSTRAINTS_FIELDS, SEARCHABLE_COLUMNS } from '../../initializers' - import { database as db } from '../../initializers/database' import { UserInstance } from '../../models/account/user-interface' +import { VideoInstance } from '../../models/video/video-interface' import { authenticate } from '../oauth' -import { areValidationErrors, checkErrors } from './utils' -import { isVideoExistsPromise } from '../../helpers/index' +import { areValidationErrors } from './utils' const videosAddValidator = [ body('videofile').custom((value, { req }) => isVideoFile(req.files)).withMessage( @@ -42,68 +41,58 @@ const videosAddValidator = [ body('privacy').custom(isVideoPrivacyValid).withMessage('Should have correct video privacy'), body('tags').optional().custom(isVideoTagsValid).withMessage('Should have correct tags'), - (req: express.Request, res: express.Response, next: express.NextFunction) => { + async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking videosAdd parameters', { parameters: req.body, files: req.files }) - checkErrors(req, res, () => { - const videoFile: Express.Multer.File = req.files['videofile'][0] - const user = res.locals.oauth.token.User + if (areValidationErrors(req, res)) return + + const videoFile: Express.Multer.File = req.files['videofile'][0] + const user = res.locals.oauth.token.User - return db.VideoChannel.loadByIdAndAccount(req.body.channelId, user.Account.id) - .then(videoChannel => { - if (!videoChannel) { - res.status(400) - .json({ error: 'Unknown video video channel for this account.' }) - .end() + const videoChannel = await db.VideoChannel.loadByIdAndAccount(req.body.channelId, user.Account.id) + if (!videoChannel) { + res.status(400) + .json({ error: 'Unknown video video channel for this account.' }) + .end() - return undefined - } - - res.locals.videoChannel = videoChannel - - return user.isAbleToUploadVideo(videoFile) - }) - .then(isAble => { - if (isAble === false) { - res.status(403) - .json({ error: 'The user video quota is exceeded with this video.' }) - .end() - - return undefined - } - - return getDurationFromVideoFile(videoFile.path) - .catch(err => { - logger.error('Invalid input file in videosAddValidator.', err) - res.status(400) - .json({ error: 'Invalid input file.' }) - .end() - - return undefined - }) - }) - .then(duration => { - // Previous test failed, abort - if (duration === undefined) return undefined - - if (!isVideoDurationValid('' + duration)) { - return res.status(400) - .json({ - error: 'Duration of the video file is too big (max: ' + CONSTRAINTS_FIELDS.VIDEOS.DURATION.max + 's).' - }) - .end() - } - - videoFile['duration'] = duration - next() - }) - .catch(err => { - logger.error('Error in video add validator', err) - res.sendStatus(500) - - return undefined - }) - }) + return + } + + res.locals.videoChannel = videoChannel + + const isAble = await user.isAbleToUploadVideo(videoFile) + if (isAble === false) { + res.status(403) + .json({ error: 'The user video quota is exceeded with this video.' }) + .end() + + return + } + + let duration: number + + try { + duration = await getDurationFromVideoFile(videoFile.path) + } catch (err) { + logger.error('Invalid input file in videosAddValidator.', err) + res.status(400) + .json({ error: 'Invalid input file.' }) + .end() + + return + } + + if (!isVideoDurationValid('' + duration)) { + return res.status(400) + .json({ + error: 'Duration of the video file is too big (max: ' + CONSTRAINTS_FIELDS.VIDEOS.DURATION.max + 's).' + }) + .end() + } + + videoFile['duration'] = duration + + return next() } ] @@ -118,61 +107,59 @@ const videosUpdateValidator = [ body('description').optional().custom(isVideoDescriptionValid).withMessage('Should have a valid description'), body('tags').optional().custom(isVideoTagsValid).withMessage('Should have correct tags'), - (req: express.Request, res: express.Response, next: express.NextFunction) => { + async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking videosUpdate parameters', { parameters: req.body }) - checkErrors(req, res, () => { - checkVideoExists(req.params.id, res, () => { - const video = res.locals.video - - // We need to make additional checks - if (video.isOwned() === false) { - return res.status(403) - .json({ error: 'Cannot update video of another server' }) - .end() - } - - if (video.VideoChannel.Account.userId !== res.locals.oauth.token.User.id) { - return res.status(403) - .json({ error: 'Cannot update video of another user' }) - .end() - } - - if (video.privacy !== VideoPrivacy.PRIVATE && req.body.privacy === VideoPrivacy.PRIVATE) { - return res.status(409) - .json({ error: 'Cannot set "private" a video that was not private anymore.' }) - .end() - } - - next() - }) - }) + if (areValidationErrors(req, res)) return + if (!await isVideoExist(req.params.id, res)) return + + const video = res.locals.video + + // We need to make additional checks + if (video.isOwned() === false) { + return res.status(403) + .json({ error: 'Cannot update video of another server' }) + .end() + } + + if (video.VideoChannel.Account.userId !== res.locals.oauth.token.User.id) { + return res.status(403) + .json({ error: 'Cannot update video of another user' }) + .end() + } + + if (video.privacy !== VideoPrivacy.PRIVATE && req.body.privacy === VideoPrivacy.PRIVATE) { + return res.status(409) + .json({ error: 'Cannot set "private" a video that was not private anymore.' }) + .end() + } + + return next() } ] const videosGetValidator = [ param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'), - (req: express.Request, res: express.Response, next: express.NextFunction) => { + async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking videosGet parameters', { parameters: req.params }) - checkErrors(req, res, () => { - checkVideoExists(req.params.id, res, () => { - const video = res.locals.video + if (areValidationErrors(req, res)) return + if (!await isVideoExist(req.params.id, res)) return - // Video is not private, anyone can access it - if (video.privacy !== VideoPrivacy.PRIVATE) return next() + const video = res.locals.video - authenticate(req, res, () => { - if (video.VideoChannel.Account.userId !== res.locals.oauth.token.User.id) { - return res.status(403) - .json({ error: 'Cannot get this private video of another user' }) - .end() - } + // Video is not private, anyone can access it + if (video.privacy !== VideoPrivacy.PRIVATE) return next() - next() - }) - }) + authenticate(req, res, () => { + if (video.VideoChannel.Account.userId !== res.locals.oauth.token.User.id) { + return res.status(403) + .json({ error: 'Cannot get this private video of another user' }) + .end() + } + + return next() }) } ] @@ -180,17 +167,16 @@ const videosGetValidator = [ const videosRemoveValidator = [ param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'), - (req: express.Request, res: express.Response, next: express.NextFunction) => { + async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking videosRemove parameters', { parameters: req.params }) - checkErrors(req, res, () => { - checkVideoExists(req.params.id, res, () => { - // Check if the user who did the request is able to delete the video - checkUserCanDeleteVideo(res.locals.oauth.token.User, res, () => { - next() - }) - }) - }) + if (areValidationErrors(req, res)) return + if (!await isVideoExist(req.params.id, res)) return + + // Check if the user who did the request is able to delete the video + if (!checkUserCanDeleteVideo(res.locals.oauth.token.User, res.locals.video, res)) return + + return next() } ] @@ -201,7 +187,9 @@ const videosSearchValidator = [ (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking videosSearch parameters', { parameters: req.params }) - checkErrors(req, res, next) + if (areValidationErrors(req, res)) return + + return next() } ] @@ -209,12 +197,13 @@ const videoAbuseReportValidator = [ param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'), body('reason').custom(isVideoAbuseReasonValid).withMessage('Should have a valid reason'), - (req: express.Request, res: express.Response, next: express.NextFunction) => { + async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking videoAbuseReport parameters', { parameters: req.body }) - checkErrors(req, res, () => { - checkVideoExists(req.params.id, res, next) - }) + if (areValidationErrors(req, res)) return + if (!await isVideoExist(req.params.id, res)) return + + return next() } ] @@ -222,12 +211,13 @@ const videoRateValidator = [ param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'), body('rating').custom(isVideoRatingTypeValid).withMessage('Should have a valid rate type'), - (req: express.Request, res: express.Response, next: express.NextFunction) => { + async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking videoRate parameters', { parameters: req.body }) - checkErrors(req, res, () => { - checkVideoExists(req.params.id, res, next) - }) + if (areValidationErrors(req, res)) return + if (!await isVideoExist(req.params.id, res)) return + + return next() } ] @@ -239,7 +229,7 @@ const videosShareValidator = [ logger.debug('Checking videoShare parameters', { parameters: req.params }) if (areValidationErrors(req, res)) return - if (!await isVideoExistsPromise(req.params.id, res)) return + if (!await isVideoExist(req.params.id, res)) return const share = await db.VideoShare.load(req.params.accountId, res.locals.video.id) if (!share) { @@ -248,7 +238,6 @@ const videosShareValidator = [ } res.locals.videoShare = share - return next() } ] @@ -270,24 +259,25 @@ export { // --------------------------------------------------------------------------- -function checkUserCanDeleteVideo (user: UserInstance, res: express.Response, callback: () => void) { +function checkUserCanDeleteVideo (user: UserInstance, video: VideoInstance, res: express.Response) { // Retrieve the user who did the request - if (res.locals.video.isOwned() === false) { - return res.status(403) + if (video.isOwned() === false) { + res.status(403) .json({ error: 'Cannot remove video of another server, blacklist it' }) .end() + return false } // Check if the user can delete the video // The user can delete it if s/he is an admin // Or if s/he is the video's account - const account = res.locals.video.VideoChannel.Account + const account = video.VideoChannel.Account if (user.hasRight(UserRight.REMOVE_ANY_VIDEO) === false && account.userId !== user.id) { - return res.status(403) + res.status(403) .json({ error: 'Cannot remove video of another user' }) .end() + return false } - // If we reach this comment, we can delete the video - callback() + return true } -- cgit v1.2.3