X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fvideos%2Fvideos.ts;h=96e0d6600bf133719dd92052f4248f74e73b23a6;hb=8319d6ae72d4da6de51bd3d4b5c68040fc8dc3b4;hp=e247db708d6a3ec7fe13057b2d79668184fb1166;hpb=fd8710b897a67518d3a61c319e54b6a65ba443ef;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/videos/videos.ts b/server/middlewares/validators/videos/videos.ts index e247db708..96e0d6600 100644 --- a/server/middlewares/validators/videos/videos.ts +++ b/server/middlewares/validators/videos/videos.ts @@ -1,6 +1,5 @@ import * as express from 'express' -import 'express-validator' -import { body, param, query, ValidationChain } from 'express-validator/check' +import { body, param, query, ValidationChain } from 'express-validator' import { UserRight, VideoChangeOwnershipStatus, VideoPrivacy } from '../../../../shared' import { isBooleanValid, @@ -9,13 +8,11 @@ import { isIdValid, isUUIDValid, toArray, + toBooleanOrNull, toIntOrNull, toValueOrNull } from '../../../helpers/custom-validators/misc' import { - checkUserCanManageVideo, - doesVideoChannelOfAccountExist, - doesVideoExist, isScheduleVideoUpdatePrivacyValid, isVideoCategoryValid, isVideoDescriptionValid, @@ -32,7 +29,7 @@ import { } from '../../../helpers/custom-validators/videos' import { getDurationFromVideoFile } from '../../../helpers/ffmpeg-utils' import { logger } from '../../../helpers/logger' -import { CONFIG, CONSTRAINTS_FIELDS } from '../../../initializers' +import { CONSTRAINTS_FIELDS } from '../../../initializers/constants' import { authenticatePromiseIfNeeded } from '../../oauth' import { areValidationErrors } from '../utils' import { cleanUpReqFiles } from '../../../helpers/express-utils' @@ -40,19 +37,29 @@ import { VideoModel } from '../../../models/video/video' import { checkUserCanTerminateOwnershipChange, doesChangeVideoOwnershipExist } from '../../../helpers/custom-validators/video-ownership' import { VideoChangeOwnershipAccept } from '../../../../shared/models/videos/video-change-ownership-accept.model' import { AccountModel } from '../../../models/account/account' -import { VideoFetchType } from '../../../helpers/video' import { isNSFWQueryValid, isNumberArray, isStringArray } from '../../../helpers/custom-validators/search' import { getServerActor } from '../../../helpers/utils' +import { CONFIG } from '../../../initializers/config' +import { isLocalVideoAccepted } from '../../../lib/moderation' +import { Hooks } from '../../../lib/plugins/hooks' +import { + checkUserCanManageVideo, + doesVideoChannelOfAccountExist, + doesVideoExist, + doesVideoFileOfVideoExist +} from '../../../helpers/middlewares' +import { MVideoFullLight } from '@server/typings/models' +import { getVideoWithAttributes } from '../../../helpers/video' const videosAddValidator = getCommonVideoEditAttributes().concat([ body('videofile') .custom((value, { req }) => isVideoFile(req.files)).withMessage( - 'This file is not supported or too large. Please, make sure it is of the following type: ' - + CONSTRAINTS_FIELDS.VIDEOS.EXTNAME.join(', ') + 'This file is not supported or too large. Please, make sure it is of the following type: ' + + CONSTRAINTS_FIELDS.VIDEOS.EXTNAME.join(', ') ), body('name').custom(isVideoNameValid).withMessage('Should have a valid name'), body('channelId') - .toInt() + .customSanitizer(toIntOrNull) .custom(isIdValid).withMessage('Should have correct video channel id'), async (req: express.Request, res: express.Response, next: express.NextFunction) => { @@ -61,13 +68,12 @@ const videosAddValidator = getCommonVideoEditAttributes().concat([ if (areValidationErrors(req, res)) return cleanUpReqFiles(req) if (areErrorsInScheduleUpdate(req, res)) return cleanUpReqFiles(req) - const videoFile: Express.Multer.File = req.files['videofile'][0] + const videoFile: Express.Multer.File & { duration?: number } = req.files['videofile'][0] const user = res.locals.oauth.token.User if (!await doesVideoChannelOfAccountExist(req.body.channelId, user, res)) return cleanUpReqFiles(req) - const isAble = await user.isAbleToUploadVideo(videoFile) - if (isAble === false) { + if (await user.isAbleToUploadVideo(videoFile) === false) { res.status(403) .json({ error: 'The user video quota is exceeded with this video.' }) @@ -86,7 +92,9 @@ const videosAddValidator = getCommonVideoEditAttributes().concat([ return cleanUpReqFiles(req) } - videoFile['duration'] = duration + videoFile.duration = duration + + if (!await isVideoAccepted(req, res, videoFile)) return cleanUpReqFiles(req) return next() } @@ -99,7 +107,7 @@ const videosUpdateValidator = getCommonVideoEditAttributes().concat([ .custom(isVideoNameValid).withMessage('Should have a valid name'), body('channelId') .optional() - .toInt() + .customSanitizer(toIntOrNull) .custom(isIdValid).withMessage('Should have correct video channel id'), async (req: express.Request, res: express.Response, next: express.NextFunction) => { @@ -109,17 +117,9 @@ const videosUpdateValidator = getCommonVideoEditAttributes().concat([ if (areErrorsInScheduleUpdate(req, res)) return cleanUpReqFiles(req) if (!await doesVideoExist(req.params.id, res)) return cleanUpReqFiles(req) - const video = res.locals.video - // Check if the user who did the request is able to update the video const user = res.locals.oauth.token.User - if (!checkUserCanManageVideo(user, res.locals.video, UserRight.UPDATE_ANY_VIDEO, res)) return cleanUpReqFiles(req) - - if (video.privacy !== VideoPrivacy.PRIVATE && req.body.privacy === VideoPrivacy.PRIVATE) { - cleanUpReqFiles(req) - return res.status(409) - .json({ error: 'Cannot set "private" a video that was not private.' }) - } + if (!checkUserCanManageVideo(user, res.locals.videoAll, UserRight.UPDATE_ANY_VIDEO, res)) return cleanUpReqFiles(req) if (req.body.channelId && !await doesVideoChannelOfAccountExist(req.body.channelId, user, res)) return cleanUpReqFiles(req) @@ -128,7 +128,7 @@ const videosUpdateValidator = getCommonVideoEditAttributes().concat([ ]) async function checkVideoFollowConstraints (req: express.Request, res: express.Response, next: express.NextFunction) { - const video = res.locals.video + const video = getVideoWithAttributes(res) // Anybody can watch local videos if (video.isOwned() === true) return next() @@ -152,7 +152,10 @@ async function checkVideoFollowConstraints (req: express.Request, res: express.R }) } -const videosCustomGetValidator = (fetchType: VideoFetchType) => { +const videosCustomGetValidator = ( + fetchType: 'all' | 'only-video' | 'only-video-with-rights' | 'only-immutable-attributes', + authenticateInQuery = false +) => { return [ param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'), @@ -162,21 +165,22 @@ const videosCustomGetValidator = (fetchType: VideoFetchType) => { if (areValidationErrors(req, res)) return if (!await doesVideoExist(req.params.id, res, fetchType)) return - const video = res.locals.video + // Controllers does not need to check video rights + if (fetchType === 'only-immutable-attributes') return next() + + const video = getVideoWithAttributes(res) + const videoAll = video as MVideoFullLight // Video private or blacklisted - if (video.privacy === VideoPrivacy.PRIVATE || video.VideoBlacklist) { - await authenticatePromiseIfNeeded(req, res) + if (videoAll.requiresAuth()) { + await authenticatePromiseIfNeeded(req, res, authenticateInQuery) const user = res.locals.oauth ? res.locals.oauth.token.User : null // Only the owner or a user that have blacklist rights can see the video - if ( - !user || - (video.VideoChannel.Account.userId !== user.id && !user.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST)) - ) { + if (!user || !user.canGetVideo(videoAll)) { return res.status(403) - .json({ error: 'Cannot get this private or blacklisted video.' }) + .json({ error: 'Cannot get this private/internal or blacklisted video.' }) } return next() @@ -197,6 +201,21 @@ const videosCustomGetValidator = (fetchType: VideoFetchType) => { } const videosGetValidator = videosCustomGetValidator('all') +const videosDownloadValidator = videosCustomGetValidator('all', true) + +const videoFileMetadataGetValidator = getCommonVideoEditAttributes().concat([ + param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'), + param('videoFileId').custom(isIdValid).not().isEmpty().withMessage('Should have a valid videoFileId'), + + async (req: express.Request, res: express.Response, next: express.NextFunction) => { + logger.debug('Checking videoFileMetadataGet parameters', { parameters: req.params }) + + if (areValidationErrors(req, res)) return + if (!await doesVideoFileOfVideoExist(+req.params.videoFileId, req.params.id, res)) return + + return next() + } +]) const videosRemoveValidator = [ param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'), @@ -208,7 +227,7 @@ const videosRemoveValidator = [ if (!await doesVideoExist(req.params.id, res)) return // Check if the user who did the request is able to delete the video - if (!checkUserCanManageVideo(res.locals.oauth.token.User, res.locals.video, UserRight.REMOVE_ANY_VIDEO, res)) return + if (!checkUserCanManageVideo(res.locals.oauth.token.User, res.locals.videoAll, UserRight.REMOVE_ANY_VIDEO, res)) return return next() } @@ -224,7 +243,7 @@ const videosChangeOwnershipValidator = [ if (!await doesVideoExist(req.params.videoId, res)) return // Check if the user who did the request is able to change the ownership of the video - if (!checkUserCanManageVideo(res.locals.oauth.token.User, res.locals.video, UserRight.CHANGE_VIDEO_OWNERSHIP, res)) return + if (!checkUserCanManageVideo(res.locals.oauth.token.User, res.locals.videoAll, UserRight.CHANGE_VIDEO_OWNERSHIP, res)) return const nextOwner = await AccountModel.loadLocalByName(req.body.username) if (!nextOwner) { @@ -251,19 +270,15 @@ const videosTerminateChangeOwnershipValidator = [ // Check if the user who did the request is able to change the ownership of the video if (!checkUserCanTerminateOwnershipChange(res.locals.oauth.token.User, res.locals.videoChangeOwnership, res)) return - return next() - }, - async (req: express.Request, res: express.Response, next: express.NextFunction) => { const videoChangeOwnership = res.locals.videoChangeOwnership - if (videoChangeOwnership.status === VideoChangeOwnershipStatus.WAITING) { - return next() - } else { + if (videoChangeOwnership.status !== VideoChangeOwnershipStatus.WAITING) { res.status(403) - .json({ error: 'Ownership already accepted or refused' }) - + .json({ error: 'Ownership already accepted or refused' }) return } + + return next() } ] @@ -274,7 +289,7 @@ const videosAcceptChangeOwnershipValidator = [ const user = res.locals.oauth.token.User const videoChangeOwnership = res.locals.videoChangeOwnership - const isAble = await user.isAbleToUploadVideo(videoChangeOwnership.Video.getOriginalFile()) + const isAble = await user.isAbleToUploadVideo(videoChangeOwnership.Video.getMaxQualityFile()) if (isAble === false) { res.status(403) .json({ error: 'The user video quota is exceeded with this video.' }) @@ -290,14 +305,14 @@ function getCommonVideoEditAttributes () { return [ body('thumbnailfile') .custom((value, { req }) => isVideoImage(req.files, 'thumbnailfile')).withMessage( - 'This thumbnail file is not supported or too large. Please, make sure it is of the following type: ' - + CONSTRAINTS_FIELDS.VIDEOS.IMAGE.EXTNAME.join(', ') - ), + 'This thumbnail file is not supported or too large. Please, make sure it is of the following type: ' + + CONSTRAINTS_FIELDS.VIDEOS.IMAGE.EXTNAME.join(', ') + ), body('previewfile') .custom((value, { req }) => isVideoImage(req.files, 'previewfile')).withMessage( - 'This preview file is not supported or too large. Please, make sure it is of the following type: ' - + CONSTRAINTS_FIELDS.VIDEOS.IMAGE.EXTNAME.join(', ') - ), + 'This preview file is not supported or too large. Please, make sure it is of the following type: ' + + CONSTRAINTS_FIELDS.VIDEOS.IMAGE.EXTNAME.join(', ') + ), body('category') .optional() @@ -313,15 +328,15 @@ function getCommonVideoEditAttributes () { .custom(isVideoLanguageValid).withMessage('Should have a valid language'), body('nsfw') .optional() - .toBoolean() + .customSanitizer(toBooleanOrNull) .custom(isBooleanValid).withMessage('Should have a valid NSFW attribute'), body('waitTranscoding') .optional() - .toBoolean() + .customSanitizer(toBooleanOrNull) .custom(isBooleanValid).withMessage('Should have a valid wait transcoding attribute'), body('privacy') .optional() - .toInt() + .customSanitizer(toValueOrNull) .custom(isVideoPrivacyValid).withMessage('Should have correct video privacy'), body('description') .optional() @@ -337,16 +352,16 @@ function getCommonVideoEditAttributes () { .custom(isVideoTagsValid).withMessage('Should have correct tags'), body('commentsEnabled') .optional() - .toBoolean() + .customSanitizer(toBooleanOrNull) .custom(isBooleanValid).withMessage('Should have comments enabled boolean'), body('downloadEnabled') .optional() - .toBoolean() + .customSanitizer(toBooleanOrNull) .custom(isBooleanValid).withMessage('Should have downloading enabled boolean'), body('originallyPublishedAt') - .optional() - .customSanitizer(toValueOrNull) - .custom(isVideoOriginallyPublishedAtValid).withMessage('Should have a valid original publication date'), + .optional() + .customSanitizer(toValueOrNull) + .custom(isVideoOriginallyPublishedAtValid).withMessage('Should have a valid original publication date'), body('scheduleUpdate') .optional() .customSanitizer(toValueOrNull), @@ -355,7 +370,7 @@ function getCommonVideoEditAttributes () { .custom(isDateValid).withMessage('Should have a valid schedule update date'), body('scheduleUpdate.privacy') .optional() - .toInt() + .customSanitizer(toIntOrNull) .custom(isScheduleVideoUpdatePrivacyValid).withMessage('Should have correct schedule update privacy') ] as (ValidationChain | express.Handler)[] } @@ -387,6 +402,10 @@ const commonVideosFiltersValidator = [ query('filter') .optional() .custom(isVideoFilterValid).withMessage('Should have a valid filter attribute'), + query('skipCount') + .optional() + .customSanitizer(toBooleanOrNull) + .custom(isBooleanValid).withMessage('Should have a valid skip count boolean'), (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking commons video filters query', { parameters: req.query }) @@ -411,6 +430,8 @@ export { videosAddValidator, videosUpdateValidator, videosGetValidator, + videoFileMetadataGetValidator, + videosDownloadValidator, checkVideoFollowConstraints, videosCustomGetValidator, videosRemoveValidator, @@ -440,3 +461,27 @@ function areErrorsInScheduleUpdate (req: express.Request, res: express.Response) return false } + +async function isVideoAccepted (req: express.Request, res: express.Response, videoFile: Express.Multer.File & { duration?: number }) { + // Check we accept this video + const acceptParameters = { + videoBody: req.body, + videoFile, + user: res.locals.oauth.token.User + } + const acceptedResult = await Hooks.wrapFun( + isLocalVideoAccepted, + acceptParameters, + 'filter:api.video.upload.accept.result' + ) + + if (!acceptedResult || acceptedResult.accepted !== true) { + logger.info('Refused local video.', { acceptedResult, acceptParameters }) + res.status(403) + .json({ error: acceptedResult.errorMessage || 'Refused local video' }) + + return false + } + + return true +}