X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fvideos%2Fvideos.ts;h=794e1d4f1efa199b5c55dfed9c202e0ea89ba50a;hb=HEAD;hp=c6d31f8f053ff2aa845c1d5519e8bf3fc90517a1;hpb=83b1b7eaf1c04837f92de497e74895bee808eb83;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/videos/videos.ts b/server/middlewares/validators/videos/videos.ts index c6d31f8f0..794e1d4f1 100644 --- a/server/middlewares/validators/videos/videos.ts +++ b/server/middlewares/validators/videos/videos.ts @@ -6,15 +6,15 @@ import { Redis } from '@server/lib/redis' import { getServerActor } from '@server/models/application/application' import { ExpressPromiseHandler } from '@server/types/express-handler' import { MUserAccountId, MVideoFullLight } from '@server/types/models' -import { getAllPrivacies } from '@shared/core-utils' -import { HttpStatusCode, ServerErrorCode, UserRight, VideoInclude } from '@shared/models' +import { arrayify, getAllPrivacies } from '@shared/core-utils' +import { getVideoStreamDuration } from '@shared/ffmpeg' +import { HttpStatusCode, ServerErrorCode, UserRight, VideoInclude, VideoState } from '@shared/models' import { exists, isBooleanValid, isDateValid, isFileValid, isIdValid, - toArray, toBooleanOrNull, toIntOrNull, toValueOrNull @@ -38,7 +38,6 @@ import { isVideoSupportValid } from '../../../helpers/custom-validators/videos' import { cleanUpReqFiles } from '../../../helpers/express-utils' -import { getVideoStreamDuration } from '../../../helpers/ffmpeg' import { logger } from '../../../helpers/logger' import { deleteFileAndCatch } from '../../../helpers/utils' import { getVideoWithAttributes } from '../../../helpers/video' @@ -49,6 +48,7 @@ import { Hooks } from '../../../lib/plugins/hooks' import { VideoModel } from '../../../models/video/video' import { areValidationErrors, + checkCanAccessVideoStaticFiles, checkCanSeeVideo, checkUserCanManageVideo, checkUserQuota, @@ -69,11 +69,9 @@ const videosAddLegacyValidator = getCommonVideoEditAttributes().concat([ ), body('channelId') .customSanitizer(toIntOrNull) - .custom(isIdValid).withMessage('Should have correct video channel id'), + .custom(isIdValid), async (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking videosAdd parameters', { parameters: req.body, files: req.files }) - if (areValidationErrors(req, res)) return cleanUpReqFiles(req) const videoFile: express.VideoUploadFile = req.files['videofile'][0] @@ -167,9 +165,7 @@ const videosAddResumableValidator = [ */ const videosAddResumableInitValidator = getCommonVideoEditAttributes().concat([ body('filename') - .isString() - .exists() - .withMessage('Should have a valid filename'), + .exists(), body('name') .trim() .custom(isVideoNameValid).withMessage( @@ -177,7 +173,7 @@ const videosAddResumableInitValidator = getCommonVideoEditAttributes().concat([ ), body('channelId') .customSanitizer(toIntOrNull) - .custom(isIdValid).withMessage('Should have correct video channel id'), + .custom(isIdValid), header('x-upload-content-length') .isNumeric() @@ -204,7 +200,7 @@ const videosAddResumableInitValidator = getCommonVideoEditAttributes().concat([ files: req.files }) - if (areValidationErrors(req, res)) return cleanup() + if (areValidationErrors(req, res, { omitLog: true })) return cleanup() const files = { videofile: [ videoFileMetadata ] } if (!await commonVideoChecksPass({ req, res, user, videoFileSize: videoFileMetadata.size, files })) return cleanup() @@ -230,15 +226,18 @@ const videosUpdateValidator = getCommonVideoEditAttributes().concat([ body('channelId') .optional() .customSanitizer(toIntOrNull) - .custom(isIdValid).withMessage('Should have correct video channel id'), + .custom(isIdValid), async (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking videosUpdate parameters', { parameters: req.body }) - if (areValidationErrors(req, res)) return cleanUpReqFiles(req) if (areErrorsInScheduleUpdate(req, res)) return cleanUpReqFiles(req) if (!await doesVideoExist(req.params.id, res)) return cleanUpReqFiles(req) + const video = getVideoWithAttributes(res) + if (video.isLive && video.privacy !== req.body.privacy && video.state !== VideoState.WAITING_FOR_LIVE) { + return res.fail({ message: 'Cannot update privacy of a live that has already started' }) + } + // 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.videoAll, UserRight.UPDATE_ANY_VIDEO, res)) return cleanUpReqFiles(req) @@ -278,16 +277,11 @@ async function checkVideoFollowConstraints (req: express.Request, res: express.R }) } -const videosCustomGetValidator = ( - fetchType: 'for-api' | 'all' | 'only-video' | 'only-immutable-attributes', - authenticateInQuery = false -) => { +const videosCustomGetValidator = (fetchType: 'for-api' | 'all' | 'only-video' | 'only-immutable-attributes') => { return [ isValidVideoIdParam('id'), async (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking videosGet parameters', { parameters: req.params }) - if (areValidationErrors(req, res)) return if (!await doesVideoExist(req.params.id, res, fetchType)) return @@ -296,7 +290,7 @@ const videosCustomGetValidator = ( const video = getVideoWithAttributes(res) as MVideoFullLight - if (!await checkCanSeeVideo({ req, res, video, paramId: req.params.id, authenticateInQuery })) return + if (!await checkCanSeeVideo({ req, res, video, paramId: req.params.id })) return return next() } @@ -304,7 +298,6 @@ const videosCustomGetValidator = ( } const videosGetValidator = videosCustomGetValidator('all') -const videosDownloadValidator = videosCustomGetValidator('all', true) const videoFileMetadataGetValidator = getCommonVideoEditAttributes().concat([ isValidVideoIdParam('id'), @@ -313,8 +306,6 @@ const videoFileMetadataGetValidator = getCommonVideoEditAttributes().concat([ .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 @@ -322,12 +313,25 @@ const videoFileMetadataGetValidator = getCommonVideoEditAttributes().concat([ } ]) -const videosRemoveValidator = [ +const videosDownloadValidator = [ isValidVideoIdParam('id'), async (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking videosRemove parameters', { parameters: req.params }) + if (areValidationErrors(req, res)) return + if (!await doesVideoExist(req.params.id, res, 'all')) return + + const video = getVideoWithAttributes(res) + + if (!await checkCanAccessVideoStaticFiles({ req, res, video, paramId: req.params.id })) return + + return next() + } +] +const videosRemoveValidator = [ + isValidVideoIdParam('id'), + + async (req: express.Request, res: express.Response, next: express.NextFunction) => { if (areValidationErrors(req, res)) return if (!await doesVideoExist(req.params.id, res)) return @@ -341,8 +345,7 @@ const videosRemoveValidator = [ const videosOverviewValidator = [ query('page') .optional() - .isInt({ min: 1, max: OVERVIEWS.VIDEOS.SAMPLES_COUNT }) - .withMessage('Should have a valid pagination'), + .isInt({ min: 1, max: OVERVIEWS.VIDEOS.SAMPLES_COUNT }), (req: express.Request, res: express.Response, next: express.NextFunction) => { if (areValidationErrors(req, res)) return @@ -367,35 +370,35 @@ function getCommonVideoEditAttributes () { body('category') .optional() .customSanitizer(toIntOrNull) - .custom(isVideoCategoryValid).withMessage('Should have a valid category'), + .custom(isVideoCategoryValid), body('licence') .optional() .customSanitizer(toIntOrNull) - .custom(isVideoLicenceValid).withMessage('Should have a valid licence'), + .custom(isVideoLicenceValid), body('language') .optional() .customSanitizer(toValueOrNull) - .custom(isVideoLanguageValid).withMessage('Should have a valid language'), + .custom(isVideoLanguageValid), body('nsfw') .optional() .customSanitizer(toBooleanOrNull) - .custom(isBooleanValid).withMessage('Should have a valid NSFW attribute'), + .custom(isBooleanValid).withMessage('Should have a valid nsfw boolean'), body('waitTranscoding') .optional() .customSanitizer(toBooleanOrNull) - .custom(isBooleanValid).withMessage('Should have a valid wait transcoding attribute'), + .custom(isBooleanValid).withMessage('Should have a valid waitTranscoding boolean'), body('privacy') .optional() - .customSanitizer(toValueOrNull) - .custom(isVideoPrivacyValid).withMessage('Should have correct video privacy'), + .customSanitizer(toIntOrNull) + .custom(isVideoPrivacyValid), body('description') .optional() .customSanitizer(toValueOrNull) - .custom(isVideoDescriptionValid).withMessage('Should have a valid description'), + .custom(isVideoDescriptionValid), body('support') .optional() .customSanitizer(toValueOrNull) - .custom(isVideoSupportValid).withMessage('Should have a valid support text'), + .custom(isVideoSupportValid), body('tags') .optional() .customSanitizer(toValueOrNull) @@ -407,15 +410,15 @@ function getCommonVideoEditAttributes () { body('commentsEnabled') .optional() .customSanitizer(toBooleanOrNull) - .custom(isBooleanValid).withMessage('Should have comments enabled boolean'), + .custom(isBooleanValid).withMessage('Should have commentsEnabled boolean'), body('downloadEnabled') .optional() .customSanitizer(toBooleanOrNull) - .custom(isBooleanValid).withMessage('Should have downloading enabled boolean'), + .custom(isBooleanValid).withMessage('Should have downloadEnabled boolean'), body('originallyPublishedAt') .optional() .customSanitizer(toValueOrNull) - .custom(isVideoOriginallyPublishedAtValid).withMessage('Should have a valid original publication date'), + .custom(isVideoOriginallyPublishedAtValid), body('scheduleUpdate') .optional() .customSanitizer(toValueOrNull), @@ -425,71 +428,73 @@ function getCommonVideoEditAttributes () { body('scheduleUpdate.privacy') .optional() .customSanitizer(toIntOrNull) - .custom(isScheduleVideoUpdatePrivacyValid).withMessage('Should have correct schedule update privacy') + .custom(isScheduleVideoUpdatePrivacyValid) ] as (ValidationChain | ExpressPromiseHandler)[] } const commonVideosFiltersValidator = [ query('categoryOneOf') .optional() - .customSanitizer(toArray) - .custom(isNumberArray).withMessage('Should have a valid one of category array'), + .customSanitizer(arrayify) + .custom(isNumberArray).withMessage('Should have a valid categoryOneOf array'), query('licenceOneOf') .optional() - .customSanitizer(toArray) - .custom(isNumberArray).withMessage('Should have a valid one of licence array'), + .customSanitizer(arrayify) + .custom(isNumberArray).withMessage('Should have a valid licenceOneOf array'), query('languageOneOf') .optional() - .customSanitizer(toArray) - .custom(isStringArray).withMessage('Should have a valid one of language array'), + .customSanitizer(arrayify) + .custom(isStringArray).withMessage('Should have a valid languageOneOf array'), query('privacyOneOf') .optional() - .customSanitizer(toArray) - .custom(isNumberArray).withMessage('Should have a valid one of privacy array'), + .customSanitizer(arrayify) + .custom(isNumberArray).withMessage('Should have a valid privacyOneOf array'), query('tagsOneOf') .optional() - .customSanitizer(toArray) - .custom(isStringArray).withMessage('Should have a valid one of tags array'), + .customSanitizer(arrayify) + .custom(isStringArray).withMessage('Should have a valid tagsOneOf array'), query('tagsAllOf') .optional() - .customSanitizer(toArray) - .custom(isStringArray).withMessage('Should have a valid all of tags array'), + .customSanitizer(arrayify) + .custom(isStringArray).withMessage('Should have a valid tagsAllOf array'), query('nsfw') .optional() - .custom(isBooleanBothQueryValid).withMessage('Should have a valid NSFW attribute'), + .custom(isBooleanBothQueryValid), query('isLive') .optional() .customSanitizer(toBooleanOrNull) - .custom(isBooleanValid).withMessage('Should have a valid live boolean'), + .custom(isBooleanValid).withMessage('Should have a valid isLive boolean'), query('filter') .optional() - .custom(isVideoFilterValid).withMessage('Should have a valid filter attribute'), + .custom(isVideoFilterValid), query('include') .optional() - .custom(isVideoIncludeValid).withMessage('Should have a valid include attribute'), + .custom(isVideoIncludeValid), query('isLocal') .optional() .customSanitizer(toBooleanOrNull) - .custom(isBooleanValid).withMessage('Should have a valid local boolean'), + .custom(isBooleanValid).withMessage('Should have a valid isLocal boolean'), query('hasHLSFiles') .optional() .customSanitizer(toBooleanOrNull) - .custom(isBooleanValid).withMessage('Should have a valid has hls boolean'), + .custom(isBooleanValid).withMessage('Should have a valid hasHLSFiles boolean'), query('hasWebtorrentFiles') .optional() .customSanitizer(toBooleanOrNull) - .custom(isBooleanValid).withMessage('Should have a valid has webtorrent boolean'), + .custom(isBooleanValid).withMessage('Should have a valid hasWebtorrentFiles boolean'), query('skipCount') .optional() .customSanitizer(toBooleanOrNull) - .custom(isBooleanValid).withMessage('Should have a valid skip count boolean'), + .custom(isBooleanValid).withMessage('Should have a valid skipCount boolean'), query('search') .optional() - .custom(exists).withMessage('Should have a valid search'), + .custom(exists), + query('excludeAlreadyWatched') + .optional() + .customSanitizer(toBooleanOrNull) + .isBoolean().withMessage('Should be a valid excludeAlreadyWatched boolean'), (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking commons video filters query', { parameters: req.query }) - if (areValidationErrors(req, res)) return // FIXME: deprecated in 4.0, to remove @@ -519,6 +524,13 @@ const commonVideosFiltersValidator = [ } } + if (!user && exists(req.query.excludeAlreadyWatched)) { + res.fail({ + status: HttpStatusCode.BAD_REQUEST_400, + message: 'Cannot use excludeAlreadyWatched parameter when auth token is not provided' + }) + return false + } return next() } ]