X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fmiddlewares%2Fvalidators%2Fvideos.ts;h=ee2ac50c8931840d923447a37181966ab810af8b;hb=f3aaa9a95cc2b61f1f255472d7014d08faa66561;hp=e197d46069c09bc3b8ef0465b972078dbfa350eb;hpb=fd45e8f43c2638478599ca75632518054461da85;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/videos.ts b/server/middlewares/validators/videos.ts index e197d4606..ee2ac50c8 100644 --- a/server/middlewares/validators/videos.ts +++ b/server/middlewares/validators/videos.ts @@ -1,29 +1,29 @@ -import { body, param, query } from 'express-validator/check' import * as express from 'express' - -import { database as db } from '../../initializers/database' -import { checkErrors } from './utils' -import { CONSTRAINTS_FIELDS, SEARCHABLE_COLUMNS } from '../../initializers' +import { body, param, query } from 'express-validator/check' +import { UserRight, VideoPrivacy } from '../../../shared' +import { isIdOrUUIDValid, isIdValid } from '../../helpers/custom-validators/misc' import { - logger, - isVideoDurationValid, - isVideoFile, - isVideoNameValid, + isVideoAbuseReasonValid, isVideoCategoryValid, - isVideoLicenceValid, isVideoDescriptionValid, + isVideoExist, + isVideoFile, isVideoLanguageValid, - isVideoTagsValid, + isVideoLicenceValid, + isVideoNameValid, isVideoNSFWValid, - isIdOrUUIDValid, - isVideoAbuseReasonValid, + isVideoPrivacyValid, isVideoRatingTypeValid, - getDurationFromVideoFile, - checkVideoExists, - isIdValid, - isVideoPrivacyValid -} from '../../helpers' -import { UserRight, VideoPrivacy } from '../../../shared' + isVideoTagsValid +} from '../../helpers/custom-validators/videos' +import { getDurationFromVideoFile } from '../../helpers/ffmpeg-utils' +import { logger } from '../../helpers/logger' +import { CONSTRAINTS_FIELDS } 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 } from './utils' const videosAddValidator = [ body('videofile').custom((value, { req }) => isVideoFile(req.files)).withMessage( @@ -40,68 +40,50 @@ 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 - return db.VideoChannel.loadByIdAndAuthor(req.body.channelId, user.Author.id) - .then(videoChannel => { - if (!videoChannel) { - res.status(400) - .json({ error: 'Unknown video video channel for this author.' }) - .end() + const videoFile: Express.Multer.File = req.files['videofile'][0] + const user = res.locals.oauth.token.User - 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 - }) - }) + 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 + } + + 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 + } + + videoFile['duration'] = duration + + return next() } ] @@ -112,50 +94,63 @@ const videosUpdateValidator = [ body('licence').optional().custom(isVideoLicenceValid).withMessage('Should have a valid licence'), body('language').optional().custom(isVideoLanguageValid).withMessage('Should have a valid language'), body('nsfw').optional().custom(isVideoNSFWValid).withMessage('Should have a valid NSFW attribute'), - body('privacy').custom(isVideoPrivacyValid).withMessage('Should have correct video privacy'), + body('privacy').optional().custom(isVideoPrivacyValid).withMessage('Should have correct video privacy'), 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 pod' }) - .end() - } - - if (video.VideoChannel.Author.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, next) + if (areValidationErrors(req, res)) return + if (!await isVideoExist(req.params.id, res)) return + + const video = res.locals.video + + // Video is not private, anyone can access it + if (video.privacy !== VideoPrivacy.PRIVATE) return 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() }) } ] @@ -163,28 +158,28 @@ 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.id, 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() } ] const videosSearchValidator = [ - param('value').not().isEmpty().withMessage('Should have a valid search'), - query('field').optional().isIn(SEARCHABLE_COLUMNS.VIDEOS).withMessage('Should have correct searchable column'), + query('search').not().isEmpty().withMessage('Should have a valid search'), (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() } ] @@ -192,12 +187,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() } ] @@ -205,12 +201,34 @@ 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() + } +] + +const videosShareValidator = [ + param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'), + param('accountId').custom(isIdValid).not().isEmpty().withMessage('Should have a valid account id'), + + async (req: express.Request, res: express.Response, next: express.NextFunction) => { + logger.debug('Checking videoShare parameters', { parameters: req.params }) + + if (areValidationErrors(req, res)) return + if (!await isVideoExist(req.params.id, res)) return + + const share = await db.VideoShare.load(req.params.accountId, res.locals.video.id, undefined) + if (!share) { + return res.status(404) + .end() + } + + res.locals.videoShare = share + return next() } ] @@ -222,6 +240,7 @@ export { videosGetValidator, videosRemoveValidator, videosSearchValidator, + videosShareValidator, videoAbuseReportValidator, @@ -230,30 +249,25 @@ export { // --------------------------------------------------------------------------- -function checkUserCanDeleteVideo (userId: number, res: express.Response, callback: () => void) { +function checkUserCanDeleteVideo (user: UserInstance, video: VideoInstance, res: express.Response) { // Retrieve the user who did the request - db.User.loadById(userId) - .then(user => { - if (res.locals.video.isOwned() === false) { - return res.status(403) - .json({ error: 'Cannot remove video of another pod, blacklist it' }) - .end() - } + 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 author - if (user.hasRight(UserRight.REMOVE_ANY_VIDEO) === false && res.locals.video.Author.userId !== res.locals.oauth.token.User.id) { - return res.status(403) - .json({ error: 'Cannot remove video of another user' }) - .end() - } + // 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 = video.VideoChannel.Account + if (user.hasRight(UserRight.REMOVE_ANY_VIDEO) === false && account.userId !== user.id) { + 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() - }) - .catch(err => { - logger.error('Error in video request validator.', err) - return res.sendStatus(500) - }) + return true }