-import 'express-validator'
+import { body, param, query } from 'express-validator/check'
import * as express from 'express'
import * as Promise from 'bluebird'
import * as validator from 'validator'
import { database as db } from '../../initializers/database'
import { checkErrors } from './utils'
import { CONSTRAINTS_FIELDS, SEARCHABLE_COLUMNS } from '../../initializers'
-import { logger, isVideoDurationValid } from '../../helpers'
+import {
+ logger,
+ isVideoDurationValid,
+ isVideoFile,
+ isVideoNameValid,
+ isVideoCategoryValid,
+ isVideoLicenceValid,
+ isVideoDescriptionValid,
+ isVideoLanguageValid,
+ isVideoTagsValid,
+ isVideoNSFWValid,
+ isVideoIdOrUUIDValid,
+ isVideoAbuseReasonValid,
+ isVideoRatingTypeValid
+} from '../../helpers'
import { VideoInstance } from '../../models'
-function videosAddValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
- // FIXME: Don't write an error message, it seems there is a bug with express-validator
- // 'Should have a valid file'
- req.checkBody('videofile').isVideoFile(req.files)
- req.checkBody('name', 'Should have a valid name').isVideoNameValid()
- req.checkBody('category', 'Should have a valid category').isVideoCategoryValid()
- req.checkBody('licence', 'Should have a valid licence').isVideoLicenceValid()
- req.checkBody('language', 'Should have a valid language').optional().isVideoLanguageValid()
- req.checkBody('nsfw', 'Should have a valid NSFW attribute').isVideoNSFWValid()
- req.checkBody('description', 'Should have a valid description').isVideoDescriptionValid()
- req.checkBody('tags', 'Should have correct tags').optional().isVideoTagsValid()
-
- 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
-
- user.isAbleToUploadVideo(videoFile)
- .then(isAble => {
- if (isAble === false) {
- res.status(403)
- .json({ error: 'The user video quota is exceeded with this video.' })
- .end()
+const videosAddValidator = [
+ body('videofile').custom((value, { req }) => isVideoFile(req.files)).withMessage('Should have a valid file'),
+ body('name').custom(isVideoNameValid).withMessage('Should have a valid name'),
+ body('category').custom(isVideoCategoryValid).withMessage('Should have a valid category'),
+ body('licence').custom(isVideoLicenceValid).withMessage('Should have a valid licence'),
+ body('language').optional().custom(isVideoLanguageValid).withMessage('Should have a valid language'),
+ body('nsfw').custom(isVideoNSFWValid).withMessage('Should have a valid NSFW attribute'),
+ body('description').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) => {
+ 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
+
+ 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 db.Video.getDurationFromFile(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
+
+ 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 videosUpdateValidator = [
+ param('id').custom(isVideoIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
+ body('name').optional().custom(isVideoNameValid).withMessage('Should have a valid name'),
+ body('category').optional().custom(isVideoCategoryValid).withMessage('Should have a valid category'),
+ 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('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) => {
+ logger.debug('Checking videosUpdate parameters', { parameters: req.body })
+
+ checkErrors(req, res, () => {
+ checkVideoExists(req.params.id, res, () => {
+ // We need to make additional checks
+ if (res.locals.video.isOwned() === false) {
+ return res.status(403)
+ .json({ error: 'Cannot update video of another pod' })
+ .end()
}
- return db.Video.getDurationFromFile(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
-
- if (!isVideoDurationValid('' + duration)) {
- return res.status(400)
- .json({
- error: 'Duration of the video file is too big (max: ' + CONSTRAINTS_FIELDS.VIDEOS.DURATION.max + 's).'
- })
+ if (res.locals.video.Author.userId !== res.locals.oauth.token.User.id) {
+ return res.status(403)
+ .json({ error: 'Cannot update video of another user' })
.end()
}
- videoFile['duration'] = duration
next()
})
- .catch(err => {
- logger.error('Error in video add validator', err)
- res.sendStatus(500)
-
- return undefined
- })
-
- })
-}
-
-function videosUpdateValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
- req.checkParams('id', 'Should have a valid id').notEmpty().isVideoIdOrUUIDValid()
- req.checkBody('name', 'Should have a valid name').optional().isVideoNameValid()
- req.checkBody('category', 'Should have a valid category').optional().isVideoCategoryValid()
- req.checkBody('licence', 'Should have a valid licence').optional().isVideoLicenceValid()
- req.checkBody('language', 'Should have a valid language').optional().isVideoLanguageValid()
- req.checkBody('nsfw', 'Should have a valid NSFW attribute').optional().isVideoNSFWValid()
- req.checkBody('description', 'Should have a valid description').optional().isVideoDescriptionValid()
- req.checkBody('tags', 'Should have correct tags').optional().isVideoTagsValid()
-
- logger.debug('Checking videosUpdate parameters', { parameters: req.body })
-
- checkErrors(req, res, () => {
- checkVideoExists(req.params.id, res, () => {
- // We need to make additional checks
- if (res.locals.video.isOwned() === false) {
- return res.status(403)
- .json({ error: 'Cannot update video of another pod' })
- .end()
- }
-
- if (res.locals.video.Author.userId !== res.locals.oauth.token.User.id) {
- return res.status(403)
- .json({ error: 'Cannot update video of another user' })
- .end()
- }
-
- next()
})
- })
-}
+ }
+]
-function videosGetValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
- req.checkParams('id', 'Should have a valid id').notEmpty().isVideoIdOrUUIDValid()
+const videosGetValidator = [
+ param('id').custom(isVideoIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
- logger.debug('Checking videosGet parameters', { parameters: req.params })
+ (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)
- })
-}
+ checkErrors(req, res, () => {
+ checkVideoExists(req.params.id, res, next)
+ })
+ }
+]
-function videosRemoveValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
- req.checkParams('id', 'Should have a valid id').notEmpty().isVideoIdOrUUIDValid()
+const videosRemoveValidator = [
+ param('id').custom(isVideoIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
- logger.debug('Checking videosRemove parameters', { parameters: req.params })
+ (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()
+ 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()
+ })
})
})
- })
-}
+ }
+]
-function videosSearchValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
- const searchableColumns = SEARCHABLE_COLUMNS.VIDEOS
- req.checkParams('value', 'Should have a valid search').notEmpty()
- req.checkQuery('field', 'Should have correct searchable column').optional().isIn(searchableColumns)
+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'),
- logger.debug('Checking videosSearch parameters', { parameters: req.params })
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking videosSearch parameters', { parameters: req.params })
- checkErrors(req, res, next)
-}
+ checkErrors(req, res, next)
+ }
+]
-function videoAbuseReportValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
- req.checkParams('id', 'Should have a valid id').notEmpty().isVideoIdOrUUIDValid()
- req.checkBody('reason', 'Should have a valid reason').isVideoAbuseReasonValid()
+const videoAbuseReportValidator = [
+ param('id').custom(isVideoIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
+ body('reason').custom(isVideoAbuseReasonValid).withMessage('Should have a valid reason'),
- logger.debug('Checking videoAbuseReport parameters', { parameters: req.body })
+ (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)
- })
-}
+ checkErrors(req, res, () => {
+ checkVideoExists(req.params.id, res, next)
+ })
+ }
+]
-function videoRateValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
- req.checkParams('id', 'Should have a valid id').notEmpty().isVideoIdOrUUIDValid()
- req.checkBody('rating', 'Should have a valid rate type').isVideoRatingTypeValid()
+const videoRateValidator = [
+ param('id').custom(isVideoIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
+ body('rating').custom(isVideoRatingTypeValid).withMessage('Should have a valid rate type'),
- logger.debug('Checking videoRate parameters', { parameters: req.body })
+ (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)
- })
-}
+ checkErrors(req, res, () => {
+ checkVideoExists(req.params.id, res, next)
+ })
+ }
+]
-function videosBlacklistValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
- req.checkParams('id', 'Should have a valid id').notEmpty().isVideoIdOrUUIDValid()
+const videosBlacklistValidator = [
+ param('id').custom(isVideoIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid id'),
- logger.debug('Checking videosBlacklist parameters', { parameters: req.params })
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking videosBlacklist parameters', { parameters: req.params })
- checkErrors(req, res, () => {
- checkVideoExists(req.params.id, res, () => {
- checkVideoIsBlacklistable(req, res, next)
+ checkErrors(req, res, () => {
+ checkVideoExists(req.params.id, res, () => {
+ checkVideoIsBlacklistable(req, res, next)
+ })
})
- })
-}
+ }
+]
// ---------------------------------------------------------------------------
projects / github / Chocobozzz / PeerTube.git / blobdiff