X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fredundancy.ts;h=f1b2ff5cd92831409332ee671927dd27da6fe2ad;hb=45570e93974fd8902a724c24f5a10aea747350e0;hp=8098e3a449a94a89f86e132c809de4a9e742ff92;hpb=d5d9b6d7bfb7e9426b6462f7fdf285df39eea820;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/redundancy.ts b/server/middlewares/validators/redundancy.ts index 8098e3a44..f1b2ff5cd 100644 --- a/server/middlewares/validators/redundancy.ts +++ b/server/middlewares/validators/redundancy.ts @@ -1,15 +1,25 @@ import * as express from 'express' -import { body, param } from 'express-validator' -import { exists, isBooleanValid, isIdOrUUIDValid, toBooleanOrNull, toIntOrNull } from '../../helpers/custom-validators/misc' +import { body, param, query } from 'express-validator' +import { isVideoRedundancyTarget } from '@server/helpers/custom-validators/video-redundancies' +import { HttpStatusCode } from '../../../shared/models/http/http-error-codes' +import { + exists, + isBooleanValid, + isIdOrUUIDValid, + isIdValid, + toBooleanOrNull, + toCompleteUUID, + toIntOrNull +} from '../../helpers/custom-validators/misc' +import { isHostValid } from '../../helpers/custom-validators/servers' import { logger } from '../../helpers/logger' -import { areValidationErrors } from './utils' import { VideoRedundancyModel } from '../../models/redundancy/video-redundancy' -import { isHostValid } from '../../helpers/custom-validators/servers' import { ServerModel } from '../../models/server/server' -import { doesVideoExist } from '../../helpers/middlewares' +import { areValidationErrors, doesVideoExist, isValidVideoIdParam } from './shared' const videoFileRedundancyGetValidator = [ - param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid video id'), + isValidVideoIdParam('videoId'), + param('resolution') .customSanitizer(toIntOrNull) .custom(exists).withMessage('Should have a valid resolution'), @@ -33,11 +43,21 @@ const videoFileRedundancyGetValidator = [ return f.resolution === paramResolution && (!req.params.fps || paramFPS) }) - if (!videoFile) return res.status(404).json({ error: 'Video file not found.' }) + if (!videoFile) { + return res.fail({ + status: HttpStatusCode.NOT_FOUND_404, + message: 'Video file not found.' + }) + } res.locals.videoFile = videoFile const videoRedundancy = await VideoRedundancyModel.loadLocalByFileId(videoFile.id) - if (!videoRedundancy) return res.status(404).json({ error: 'Video redundancy not found.' }) + if (!videoRedundancy) { + return res.fail({ + status: HttpStatusCode.NOT_FOUND_404, + message: 'Video redundancy not found.' + }) + } res.locals.videoRedundancy = videoRedundancy return next() @@ -45,9 +65,8 @@ const videoFileRedundancyGetValidator = [ ] const videoPlaylistRedundancyGetValidator = [ - param('videoId') - .custom(isIdOrUUIDValid) - .not().isEmpty().withMessage('Should have a valid video id'), + isValidVideoIdParam('videoId'), + param('streamingPlaylistType') .customSanitizer(toIntOrNull) .custom(exists).withMessage('Should have a valid streaming playlist type'), @@ -63,11 +82,21 @@ const videoPlaylistRedundancyGetValidator = [ const paramPlaylistType = req.params.streamingPlaylistType as unknown as number // We casted to int above const videoStreamingPlaylist = video.VideoStreamingPlaylists.find(p => p.type === paramPlaylistType) - if (!videoStreamingPlaylist) return res.status(404).json({ error: 'Video playlist not found.' }) + if (!videoStreamingPlaylist) { + return res.fail({ + status: HttpStatusCode.NOT_FOUND_404, + message: 'Video playlist not found.' + }) + } res.locals.videoStreamingPlaylist = videoStreamingPlaylist const videoRedundancy = await VideoRedundancyModel.loadLocalByStreamingPlaylistId(videoStreamingPlaylist.id) - if (!videoRedundancy) return res.status(404).json({ error: 'Video redundancy not found.' }) + if (!videoRedundancy) { + return res.fail({ + status: HttpStatusCode.NOT_FOUND_404, + message: 'Video redundancy not found.' + }) + } res.locals.videoRedundancy = videoRedundancy return next() @@ -88,12 +117,10 @@ const updateServerRedundancyValidator = [ const server = await ServerModel.loadByHost(req.params.host) if (!server) { - return res - .status(404) - .json({ - error: `Server ${req.params.host} not found.` - }) - .end() + return res.fail({ + status: HttpStatusCode.NOT_FOUND_404, + message: `Server ${req.params.host} not found.` + }) } res.locals.server = server @@ -101,10 +128,83 @@ const updateServerRedundancyValidator = [ } ] +const listVideoRedundanciesValidator = [ + query('target') + .custom(isVideoRedundancyTarget).withMessage('Should have a valid video redundancies target'), + + (req: express.Request, res: express.Response, next: express.NextFunction) => { + logger.debug('Checking listVideoRedundanciesValidator parameters', { parameters: req.query }) + + if (areValidationErrors(req, res)) return + + return next() + } +] + +const addVideoRedundancyValidator = [ + body('videoId') + .customSanitizer(toCompleteUUID) + .custom(isIdOrUUIDValid) + .withMessage('Should have a valid video id'), + + async (req: express.Request, res: express.Response, next: express.NextFunction) => { + logger.debug('Checking addVideoRedundancyValidator parameters', { parameters: req.query }) + + if (areValidationErrors(req, res)) return + + if (!await doesVideoExist(req.body.videoId, res, 'only-video')) return + + if (res.locals.onlyVideo.remote === false) { + return res.fail({ message: 'Cannot create a redundancy on a local video' }) + } + + if (res.locals.onlyVideo.isLive) { + return res.fail({ message: 'Cannot create a redundancy of a live video' }) + } + + const alreadyExists = await VideoRedundancyModel.isLocalByVideoUUIDExists(res.locals.onlyVideo.uuid) + if (alreadyExists) { + return res.fail({ + status: HttpStatusCode.CONFLICT_409, + message: 'This video is already duplicated by your instance.' + }) + } + + return next() + } +] + +const removeVideoRedundancyValidator = [ + param('redundancyId') + .custom(isIdValid) + .withMessage('Should have a valid redundancy id'), + + async (req: express.Request, res: express.Response, next: express.NextFunction) => { + logger.debug('Checking removeVideoRedundancyValidator parameters', { parameters: req.query }) + + if (areValidationErrors(req, res)) return + + const redundancy = await VideoRedundancyModel.loadByIdWithVideo(parseInt(req.params.redundancyId, 10)) + if (!redundancy) { + return res.fail({ + status: HttpStatusCode.NOT_FOUND_404, + message: 'Video redundancy not found' + }) + } + + res.locals.videoRedundancy = redundancy + + return next() + } +] + // --------------------------------------------------------------------------- export { videoFileRedundancyGetValidator, videoPlaylistRedundancyGetValidator, - updateServerRedundancyValidator + updateServerRedundancyValidator, + listVideoRedundanciesValidator, + addVideoRedundancyValidator, + removeVideoRedundancyValidator }