X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fmiddlewares%2Fvalidators%2Fvideos%2Fvideos.ts;h=1e727533bfef894fcff887883d236ceeda4374c8;hb=cea093bca5b9d311b5c1d0539d53e965c901015b;hp=bb617d77c3dd83a0a309cd88e3e25065bef48586;hpb=1fd61899eaea245a5844e33e21f04b2562f16e5e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/videos/videos.ts b/server/middlewares/validators/videos/videos.ts index bb617d77c..1e727533b 100644 --- a/server/middlewares/validators/videos/videos.ts +++ b/server/middlewares/validators/videos/videos.ts @@ -1,18 +1,19 @@ -import * as express from 'express' -import { body, param, query, ValidationChain } from 'express-validator' +import express from 'express' +import { body, header, param, query, ValidationChain } from 'express-validator' +import { isTestInstance } from '@server/helpers/core-utils' +import { getResumableUploadPath } from '@server/helpers/upload' +import { Redis } from '@server/lib/redis' import { isAbleToUploadVideo } from '@server/lib/user' import { getServerActor } from '@server/models/application/application' import { ExpressPromiseHandler } from '@server/types/express' -import { MVideoWithRights } from '@server/types/models' -import { ServerErrorCode, UserRight, VideoChangeOwnershipStatus, VideoPrivacy } from '../../../../shared' -import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' -import { VideoChangeOwnershipAccept } from '../../../../shared/models/videos/video-change-ownership-accept.model' +import { MUserAccountId, MVideoFullLight } from '@server/types/models' +import { getAllPrivacies } from '@shared/core-utils' +import { HttpStatusCode, ServerErrorCode, UserRight, VideoInclude, VideoPrivacy } from '@shared/models' import { exists, isBooleanValid, isDateValid, isFileFieldValid, - isIdOrUUIDValid, isIdValid, isUUIDValid, toArray, @@ -21,7 +22,6 @@ import { toValueOrNull } from '../../../helpers/custom-validators/misc' import { isBooleanBothQueryValid, isNumberArray, isStringArray } from '../../../helpers/custom-validators/search' -import { checkUserCanTerminateOwnershipChange, doesChangeVideoOwnershipExist } from '../../../helpers/custom-validators/video-ownership' import { isScheduleVideoUpdatePrivacyValid, isVideoCategoryValid, @@ -30,6 +30,7 @@ import { isVideoFileSizeValid, isVideoFilterValid, isVideoImage, + isVideoIncludeValid, isVideoLanguageValid, isVideoLicenceValid, isVideoNameValid, @@ -41,30 +42,32 @@ import { import { cleanUpReqFiles } from '../../../helpers/express-utils' import { getDurationFromVideoFile } from '../../../helpers/ffprobe-utils' import { logger } from '../../../helpers/logger' -import { - checkUserCanManageVideo, - doesVideoChannelOfAccountExist, - doesVideoExist, - doesVideoFileOfVideoExist -} from '../../../helpers/middlewares' +import { deleteFileAndCatch } from '../../../helpers/utils' import { getVideoWithAttributes } from '../../../helpers/video' import { CONFIG } from '../../../initializers/config' import { CONSTRAINTS_FIELDS, OVERVIEWS } from '../../../initializers/constants' import { isLocalVideoAccepted } from '../../../lib/moderation' import { Hooks } from '../../../lib/plugins/hooks' -import { AccountModel } from '../../../models/account/account' import { VideoModel } from '../../../models/video/video' import { authenticatePromiseIfNeeded } from '../../auth' -import { areValidationErrors } from '../utils' +import { + areValidationErrors, + checkUserCanManageVideo, + doesVideoChannelOfAccountExist, + doesVideoExist, + doesVideoFileOfVideoExist, + isValidVideoIdParam +} from '../shared' -const videosAddValidator = getCommonVideoEditAttributes().concat([ +const videosAddLegacyValidator = getCommonVideoEditAttributes().concat([ body('videofile') .custom((value, { req }) => isFileFieldValid(req.files, 'videofile')) .withMessage('Should have a file'), body('name') .trim() - .custom(isVideoNameValid) - .withMessage('Should have a valid name'), + .custom(isVideoNameValid).withMessage( + `Should have a video name between ${CONSTRAINTS_FIELDS.VIDEOS.NAME.min} and ${CONSTRAINTS_FIELDS.VIDEOS.NAME.max} characters long` + ), body('channelId') .customSanitizer(toIntOrNull) .custom(isIdValid).withMessage('Should have correct video channel id'), @@ -73,65 +76,174 @@ const videosAddValidator = getCommonVideoEditAttributes().concat([ logger.debug('Checking videosAdd parameters', { parameters: req.body, files: req.files }) if (areValidationErrors(req, res)) return cleanUpReqFiles(req) - if (areErrorsInScheduleUpdate(req, res)) return cleanUpReqFiles(req) - const videoFile: Express.Multer.File & { duration?: number } = req.files['videofile'][0] + const videoFile: express.VideoUploadFile = req.files['videofile'][0] const user = res.locals.oauth.token.User - if (!await doesVideoChannelOfAccountExist(req.body.channelId, user, res)) return cleanUpReqFiles(req) + if (!await commonVideoChecksPass({ req, res, user, videoFileSize: videoFile.size, files: req.files })) { + return cleanUpReqFiles(req) + } - if (!isVideoFileMimeTypeValid(req.files)) { - res.status(HttpStatusCode.UNSUPPORTED_MEDIA_TYPE_415) - .json({ - error: 'This file is not supported. Please, make sure it is of the following type: ' + - CONSTRAINTS_FIELDS.VIDEOS.EXTNAME.join(', ') - }) + try { + if (!videoFile.duration) await addDurationToVideo(videoFile) + } catch (err) { + logger.error('Invalid input file in videosAddLegacyValidator.', { err }) + res.fail({ + status: HttpStatusCode.UNPROCESSABLE_ENTITY_422, + message: 'Video file unreadable.' + }) return cleanUpReqFiles(req) } - if (!isVideoFileSizeValid(videoFile.size.toString())) { - res.status(HttpStatusCode.PAYLOAD_TOO_LARGE_413) - .json({ - error: 'This file is too large.' - }) + if (!await isVideoAccepted(req, res, videoFile)) return cleanUpReqFiles(req) - return cleanUpReqFiles(req) + return next() + } +]) + +const videosResumableUploadIdValidator = [ + (req: express.Request, res: express.Response, next: express.NextFunction) => { + const user = res.locals.oauth.token.User + const uploadId = req.query.upload_id + + if (uploadId.startsWith(user.id + '-') !== true) { + return res.fail({ + status: HttpStatusCode.FORBIDDEN_403, + message: 'You cannot send chunks in another user upload' + }) } - if (await isAbleToUploadVideo(user.id, videoFile.size) === false) { - res.status(HttpStatusCode.PAYLOAD_TOO_LARGE_413) - .json({ error: 'The user video quota is exceeded with this video.' }) + return next() + } +] - return cleanUpReqFiles(req) +/** + * Gets called after the last PUT request + */ +const videosAddResumableValidator = [ + async (req: express.Request, res: express.Response, next: express.NextFunction) => { + const user = res.locals.oauth.token.User + const body: express.CustomUploadXFile = req.body + const file = { ...body, duration: undefined, path: getResumableUploadPath(body.name), filename: body.metadata.filename } + const cleanup = () => deleteFileAndCatch(file.path) + + const uploadId = req.query.upload_id + const sessionExists = await Redis.Instance.doesUploadSessionExist(uploadId) + + if (sessionExists) { + const sessionResponse = await Redis.Instance.getUploadSession(uploadId) + + if (!sessionResponse) { + res.setHeader('Retry-After', 300) // ask to retry after 5 min, knowing the upload_id is kept for up to 15 min after completion + + return res.fail({ + status: HttpStatusCode.SERVICE_UNAVAILABLE_503, + message: 'The upload is already being processed' + }) + } + + if (isTestInstance()) { + res.setHeader('x-resumable-upload-cached', 'true') + } + + return res.json(sessionResponse) } - let duration: number + await Redis.Instance.setUploadSession(uploadId) + + if (!await doesVideoChannelOfAccountExist(file.metadata.channelId, user, res)) return cleanup() try { - duration = await getDurationFromVideoFile(videoFile.path) + if (!file.duration) await addDurationToVideo(file) } catch (err) { - logger.error('Invalid input file in videosAddValidator.', { err }) - res.status(HttpStatusCode.UNPROCESSABLE_ENTITY_422) - .json({ error: 'Video file unreadable.' }) + logger.error('Invalid input file in videosAddResumableValidator.', { err }) - return cleanUpReqFiles(req) + res.fail({ + status: HttpStatusCode.UNPROCESSABLE_ENTITY_422, + message: 'Video file unreadable.' + }) + return cleanup() } - videoFile.duration = duration + if (!await isVideoAccepted(req, res, file)) return cleanup() - if (!await isVideoAccepted(req, res, videoFile)) return cleanUpReqFiles(req) + res.locals.videoFileResumable = file + + return next() + } +] + +/** + * File is created in POST initialisation, and its body is saved as a 'metadata' field is saved by uploadx for later use. + * see https://github.com/kukhariev/node-uploadx/blob/dc9fb4a8ac5a6f481902588e93062f591ec6ef03/packages/core/src/handlers/uploadx.ts + * + * Uploadx doesn't use next() until the upload completes, so this middleware has to be placed before uploadx + * see https://github.com/kukhariev/node-uploadx/blob/dc9fb4a8ac5a6f481902588e93062f591ec6ef03/packages/core/src/handlers/base-handler.ts + * + */ +const videosAddResumableInitValidator = getCommonVideoEditAttributes().concat([ + body('filename') + .isString() + .exists() + .withMessage('Should have a valid filename'), + body('name') + .trim() + .custom(isVideoNameValid).withMessage( + `Should have a video name between ${CONSTRAINTS_FIELDS.VIDEOS.NAME.min} and ${CONSTRAINTS_FIELDS.VIDEOS.NAME.max} characters long` + ), + body('channelId') + .customSanitizer(toIntOrNull) + .custom(isIdValid).withMessage('Should have correct video channel id'), + + header('x-upload-content-length') + .isNumeric() + .exists() + .withMessage('Should specify the file length'), + header('x-upload-content-type') + .isString() + .exists() + .withMessage('Should specify the file mimetype'), + + async (req: express.Request, res: express.Response, next: express.NextFunction) => { + const videoFileMetadata = { + mimetype: req.headers['x-upload-content-type'] as string, + size: +req.headers['x-upload-content-length'], + originalname: req.body.filename + } + + const user = res.locals.oauth.token.User + const cleanup = () => cleanUpReqFiles(req) + + logger.debug('Checking videosAddResumableInitValidator parameters and headers', { + parameters: req.body, + headers: req.headers, + files: req.files + }) + + if (areValidationErrors(req, res)) return cleanup() + + const files = { videofile: [ videoFileMetadata ] } + if (!await commonVideoChecksPass({ req, res, user, videoFileSize: videoFileMetadata.size, files })) return cleanup() + + // multer required unsetting the Content-Type, now we can set it for node-uploadx + req.headers['content-type'] = 'application/json; charset=utf-8' + // place previewfile in metadata so that uploadx saves it in .META + if (req.files?.['previewfile']) req.body.previewfile = req.files['previewfile'] return next() } ]) const videosUpdateValidator = getCommonVideoEditAttributes().concat([ - param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'), + isValidVideoIdParam('id'), + body('name') .optional() .trim() - .custom(isVideoNameValid).withMessage('Should have a valid name'), + .custom(isVideoNameValid).withMessage( + `Should have a video name between ${CONSTRAINTS_FIELDS.VIDEOS.NAME.min} and ${CONSTRAINTS_FIELDS.VIDEOS.NAME.max} characters long` + ), body('channelId') .optional() .customSanitizer(toIntOrNull) @@ -173,20 +285,22 @@ async function checkVideoFollowConstraints (req: express.Request, res: express.R const serverActor = await getServerActor() if (await VideoModel.checkVideoHasInstanceFollow(video.id, serverActor.id) === true) return next() - return res.status(HttpStatusCode.FORBIDDEN_403) - .json({ - errorCode: ServerErrorCode.DOES_NOT_RESPECT_FOLLOW_CONSTRAINTS, - error: 'Cannot get this video regarding follow constraints.', - originUrl: video.url - }) + return res.fail({ + status: HttpStatusCode.FORBIDDEN_403, + message: 'Cannot get this video regarding follow constraints', + type: ServerErrorCode.DOES_NOT_RESPECT_FOLLOW_CONSTRAINTS, + data: { + originUrl: video.url + } + }) } const videosCustomGetValidator = ( - fetchType: 'all' | 'only-video' | 'only-video-with-rights' | 'only-immutable-attributes', + fetchType: 'for-api' | 'all' | 'only-video' | 'only-immutable-attributes', authenticateInQuery = false ) => { return [ - param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'), + isValidVideoIdParam('id'), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking videosGet parameters', { parameters: req.params }) @@ -197,7 +311,7 @@ const videosCustomGetValidator = ( // Controllers does not need to check video rights if (fetchType === 'only-immutable-attributes') return next() - const video = getVideoWithAttributes(res) as MVideoWithRights + const video = getVideoWithAttributes(res) as MVideoFullLight // Video private or blacklisted if (video.requiresAuth()) { @@ -205,10 +319,12 @@ const videosCustomGetValidator = ( 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 + // Only the owner or a user that have blocklist rights can see the video if (!user || !user.canGetVideo(video)) { - return res.status(HttpStatusCode.FORBIDDEN_403) - .json({ error: 'Cannot get this private/internal or blacklisted video.' }) + return res.fail({ + status: HttpStatusCode.FORBIDDEN_403, + message: 'Cannot get this private/internal or blocklisted video' + }) } return next() @@ -222,7 +338,10 @@ const videosCustomGetValidator = ( if (isUUIDValid(req.params.id)) return next() // Don't leak this unlisted video - return res.status(HttpStatusCode.NOT_FOUND_404).end() + return res.fail({ + status: HttpStatusCode.NOT_FOUND_404, + message: 'Video not found' + }) } } ] @@ -232,8 +351,10 @@ 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'), + isValidVideoIdParam('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 }) @@ -246,7 +367,7 @@ const videoFileMetadataGetValidator = getCommonVideoEditAttributes().concat([ ]) const videosRemoveValidator = [ - param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'), + isValidVideoIdParam('id'), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking videosRemove parameters', { parameters: req.params }) @@ -261,74 +382,6 @@ const videosRemoveValidator = [ } ] -const videosChangeOwnershipValidator = [ - param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'), - - async (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking changeOwnership parameters', { parameters: req.params }) - - if (areValidationErrors(req, res)) return - 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.videoAll, UserRight.CHANGE_VIDEO_OWNERSHIP, res)) return - - const nextOwner = await AccountModel.loadLocalByName(req.body.username) - if (!nextOwner) { - res.status(HttpStatusCode.BAD_REQUEST_400) - .json({ error: 'Changing video ownership to a remote account is not supported yet' }) - - return - } - res.locals.nextOwner = nextOwner - - return next() - } -] - -const videosTerminateChangeOwnershipValidator = [ - param('id').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'), - - async (req: express.Request, res: express.Response, next: express.NextFunction) => { - logger.debug('Checking changeOwnership parameters', { parameters: req.params }) - - if (areValidationErrors(req, res)) return - if (!await doesChangeVideoOwnershipExist(req.params.id, res)) return - - // 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 - - const videoChangeOwnership = res.locals.videoChangeOwnership - - if (videoChangeOwnership.status !== VideoChangeOwnershipStatus.WAITING) { - res.status(HttpStatusCode.FORBIDDEN_403) - .json({ error: 'Ownership already accepted or refused' }) - return - } - - return next() - } -] - -const videosAcceptChangeOwnershipValidator = [ - async (req: express.Request, res: express.Response, next: express.NextFunction) => { - const body = req.body as VideoChangeOwnershipAccept - if (!await doesVideoChannelOfAccountExist(body.channelId, res.locals.oauth.token.User, res)) return - - const user = res.locals.oauth.token.User - const videoChangeOwnership = res.locals.videoChangeOwnership - const isAble = await isAbleToUploadVideo(user.id, videoChangeOwnership.Video.getMaxQualityFile().size) - if (isAble === false) { - res.status(HttpStatusCode.PAYLOAD_TOO_LARGE_413) - .json({ error: 'The user video quota is exceeded with this video.' }) - - return - } - - return next() - } -] - const videosOverviewValidator = [ query('page') .optional() @@ -390,7 +443,11 @@ function getCommonVideoEditAttributes () { body('tags') .optional() .customSanitizer(toValueOrNull) - .custom(isVideoTagsValid).withMessage('Should have correct tags'), + .custom(isVideoTagsValid) + .withMessage( + `Should have an array of up to ${CONSTRAINTS_FIELDS.VIDEOS.TAGS.max} tags between ` + + `${CONSTRAINTS_FIELDS.VIDEOS.TAG.min} and ${CONSTRAINTS_FIELDS.VIDEOS.TAG.max} characters each` + ), body('commentsEnabled') .optional() .customSanitizer(toBooleanOrNull) @@ -408,7 +465,7 @@ function getCommonVideoEditAttributes () { .customSanitizer(toValueOrNull), body('scheduleUpdate.updateAt') .optional() - .custom(isDateValid).withMessage('Should have a valid schedule update date'), + .custom(isDateValid).withMessage('Should have a schedule update date that conforms to ISO 8601'), body('scheduleUpdate.privacy') .optional() .customSanitizer(toIntOrNull) @@ -429,6 +486,10 @@ const commonVideosFiltersValidator = [ .optional() .customSanitizer(toArray) .custom(isStringArray).withMessage('Should have a valid one of language array'), + query('privacyOneOf') + .optional() + .customSanitizer(toArray) + .custom(isNumberArray).withMessage('Should have a valid one of privacy array'), query('tagsOneOf') .optional() .customSanitizer(toArray) @@ -447,6 +508,21 @@ const commonVideosFiltersValidator = [ query('filter') .optional() .custom(isVideoFilterValid).withMessage('Should have a valid filter attribute'), + query('include') + .optional() + .custom(isVideoIncludeValid).withMessage('Should have a valid include attribute'), + query('isLocal') + .optional() + .customSanitizer(toBooleanOrNull) + .custom(isBooleanValid).withMessage('Should have a valid local boolean'), + query('hasHLSFiles') + .optional() + .customSanitizer(toBooleanOrNull) + .custom(isBooleanValid).withMessage('Should have a valid has hls boolean'), + query('hasWebtorrentFiles') + .optional() + .customSanitizer(toBooleanOrNull) + .custom(isBooleanValid).withMessage('Should have a valid has webtorrent boolean'), query('skipCount') .optional() .customSanitizer(toBooleanOrNull) @@ -460,15 +536,31 @@ const commonVideosFiltersValidator = [ if (areValidationErrors(req, res)) return - const user = res.locals.oauth ? res.locals.oauth.token.User : undefined - if ( - (req.query.filter === 'all-local' || req.query.filter === 'all') && - (!user || user.hasRight(UserRight.SEE_ALL_VIDEOS) === false) - ) { - res.status(HttpStatusCode.UNAUTHORIZED_401) - .json({ error: 'You are not allowed to see all local videos.' }) + // FIXME: deprecated in 4.0, to remove + { + if (req.query.filter === 'all-local') { + req.query.include = VideoInclude.NOT_PUBLISHED_STATE + req.query.isLocal = true + req.query.privacyOneOf = getAllPrivacies() + } else if (req.query.filter === 'all') { + req.query.include = VideoInclude.NOT_PUBLISHED_STATE + req.query.privacyOneOf = getAllPrivacies() + } else if (req.query.filter === 'local') { + req.query.isLocal = true + } - return + req.query.filter = undefined + } + + const user = res.locals.oauth?.token.User + + if ((!user || user.hasRight(UserRight.SEE_ALL_VIDEOS) !== true)) { + if (req.query.include || req.query.privacyOneOf) { + return res.fail({ + status: HttpStatusCode.UNAUTHORIZED_401, + message: 'You are not allowed to see all videos.' + }) + } } return next() @@ -478,7 +570,11 @@ const commonVideosFiltersValidator = [ // --------------------------------------------------------------------------- export { - videosAddValidator, + videosAddLegacyValidator, + videosAddResumableValidator, + videosAddResumableInitValidator, + videosResumableUploadIdValidator, + videosUpdateValidator, videosGetValidator, videoFileMetadataGetValidator, @@ -487,10 +583,6 @@ export { videosCustomGetValidator, videosRemoveValidator, - videosChangeOwnershipValidator, - videosTerminateChangeOwnershipValidator, - videosAcceptChangeOwnershipValidator, - getCommonVideoEditAttributes, commonVideosFiltersValidator, @@ -505,9 +597,7 @@ function areErrorsInScheduleUpdate (req: express.Request, res: express.Response) if (!req.body.scheduleUpdate.updateAt) { logger.warn('Invalid parameters: scheduleUpdate.updateAt is mandatory.') - res.status(HttpStatusCode.BAD_REQUEST_400) - .json({ error: 'Schedule update at is mandatory.' }) - + res.fail({ message: 'Schedule update at is mandatory.' }) return true } } @@ -515,7 +605,54 @@ 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 }) { +async function commonVideoChecksPass (parameters: { + req: express.Request + res: express.Response + user: MUserAccountId + videoFileSize: number + files: express.UploadFilesForCheck +}): Promise { + const { req, res, user, videoFileSize, files } = parameters + + if (areErrorsInScheduleUpdate(req, res)) return false + + if (!await doesVideoChannelOfAccountExist(req.body.channelId, user, res)) return false + + if (!isVideoFileMimeTypeValid(files)) { + res.fail({ + status: HttpStatusCode.UNSUPPORTED_MEDIA_TYPE_415, + message: 'This file is not supported. Please, make sure it is of the following type: ' + + CONSTRAINTS_FIELDS.VIDEOS.EXTNAME.join(', ') + }) + return false + } + + if (!isVideoFileSizeValid(videoFileSize.toString())) { + res.fail({ + status: HttpStatusCode.PAYLOAD_TOO_LARGE_413, + message: 'This file is too large. It exceeds the maximum file size authorized.', + type: ServerErrorCode.MAX_FILE_SIZE_REACHED + }) + return false + } + + if (await isAbleToUploadVideo(user.id, videoFileSize) === false) { + res.fail({ + status: HttpStatusCode.PAYLOAD_TOO_LARGE_413, + message: 'The user video quota is exceeded with this video.', + type: ServerErrorCode.QUOTA_REACHED + }) + return false + } + + return true +} + +export async function isVideoAccepted ( + req: express.Request, + res: express.Response, + videoFile: express.VideoUploadFile +) { // Check we accept this video const acceptParameters = { videoBody: req.body, @@ -530,11 +667,20 @@ async function isVideoAccepted (req: express.Request, res: express.Response, vid if (!acceptedResult || acceptedResult.accepted !== true) { logger.info('Refused local video.', { acceptedResult, acceptParameters }) - res.status(HttpStatusCode.FORBIDDEN_403) - .json({ error: acceptedResult.errorMessage || 'Refused local video' }) - + res.fail({ + status: HttpStatusCode.FORBIDDEN_403, + message: acceptedResult.errorMessage || 'Refused local video' + }) return false } return true } + +async function addDurationToVideo (videoFile: { path: string, duration?: number }) { + const duration: number = await getDurationFromVideoFile(videoFile.path) + + if (isNaN(duration)) throw new Error(`Couldn't get video duration`) + + videoFile.duration = duration +}