import 'express-validator'
-import * as multer from 'multer'
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 { VideoInstance } from '../../models'
function videosAddValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
- req.checkBody('videofile', 'Should have a valid file').isVideoFile(req.files)
+ // 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()
logger.debug('Checking videosAdd parameters', { parameters: req.body, files: req.files })
- checkErrors(req, res, function () {
+ checkErrors(req, res, () => {
const videoFile = req.files.videofile[0]
- db.Video.getDurationFromFile(videoFile.path, function (err, duration) {
- if (err) {
- return res.status(400).send('Cannot retrieve metadata of the file.')
- }
-
- if (!isVideoDurationValid(duration)) {
- return res.status(400).send('Duration of the video file is too big (max: ' + CONSTRAINTS_FIELDS.VIDEOS.DURATION.max + 's).')
- }
+ db.Video.getDurationFromFile(videoFile.path)
+ .then(duration => {
+ if (!isVideoDurationValid('' + duration)) {
+ return res.status(400).send('Duration of the video file is too big (max: ' + CONSTRAINTS_FIELDS.VIDEOS.DURATION.max + 's).')
+ }
- videoFile['duration'] = duration
- next()
- })
+ videoFile['duration'] = duration
+ next()
+ })
+ .catch(err => {
+ logger.error('Error in getting duration from file.', err)
+ res.status(400).send('Cannot retrieve metadata of the file.')
+ })
})
}
function videosUpdateValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
- req.checkParams('id', 'Should have a valid id').notEmpty().isUUID(4)
+ 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()
logger.debug('Checking videosUpdate parameters', { parameters: req.body })
- checkErrors(req, res, function () {
- checkVideoExists(req.params.id, res, function () {
+ checkErrors(req, res, () => {
+ checkVideoExists(req.params.id, res, () => {
// We need to make additional checks
if (res.locals.video.isOwned() === false) {
return res.status(403).send('Cannot update video of another pod')
}
function videosGetValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
- req.checkParams('id', 'Should have a valid id').notEmpty().isUUID(4)
+ req.checkParams('id', 'Should have a valid id').notEmpty().isVideoIdOrUUIDValid()
logger.debug('Checking videosGet parameters', { parameters: req.params })
- checkErrors(req, res, function () {
+ 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().isUUID(4)
+ req.checkParams('id', 'Should have a valid id').notEmpty().isVideoIdOrUUIDValid()
logger.debug('Checking videosRemove parameters', { parameters: req.params })
- checkErrors(req, res, function () {
- checkVideoExists(req.params.id, res, function () {
+ checkErrors(req, res, () => {
+ checkVideoExists(req.params.id, res, () => {
// We need to make additional checks
// Check if the user who did the request is able to delete the video
- checkUserCanDeleteVideo(res.locals.oauth.token.User.id, res, function () {
+ checkUserCanDeleteVideo(res.locals.oauth.token.User.id, res, () => {
next()
})
})
}
function videoAbuseReportValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
- req.checkParams('id', 'Should have a valid id').notEmpty().isUUID(4)
+ req.checkParams('id', 'Should have a valid id').notEmpty().isVideoIdOrUUIDValid()
req.checkBody('reason', 'Should have a valid reason').isVideoAbuseReasonValid()
logger.debug('Checking videoAbuseReport parameters', { parameters: req.body })
- checkErrors(req, res, function () {
+ 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().isUUID(4)
+ req.checkParams('id', 'Should have a valid id').notEmpty().isVideoIdOrUUIDValid()
req.checkBody('rating', 'Should have a valid rate type').isVideoRatingTypeValid()
logger.debug('Checking videoRate parameters', { parameters: req.body })
- checkErrors(req, res, function () {
+ 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().isUUID(4)
+ req.checkParams('id', 'Should have a valid id').notEmpty().isVideoIdOrUUIDValid()
logger.debug('Checking videosBlacklist parameters', { parameters: req.params })
- checkErrors(req, res, function () {
- checkVideoExists(req.params.id, res, function () {
+ checkErrors(req, res, () => {
+ checkVideoExists(req.params.id, res, () => {
checkVideoIsBlacklistable(req, res, next)
})
})
// ---------------------------------------------------------------------------
function checkVideoExists (id: string, res: express.Response, callback: () => void) {
- db.Video.loadAndPopulateAuthorAndPodAndTags(id, function (err, video) {
- if (err) {
- logger.error('Error in video request validator.', { error: err })
- return res.sendStatus(500)
- }
+ let promise: Promise<VideoInstance>
+ if (validator.isInt(id)) {
+ promise = db.Video.loadAndPopulateAuthorAndPodAndTags(+id)
+ } else { // UUID
+ promise = db.Video.loadByUUIDAndPopulateAuthorAndPodAndTags(id)
+ }
+ promise.then(video => {
if (!video) return res.status(404).send('Video not found')
res.locals.video = video
callback()
})
+ .catch(err => {
+ logger.error('Error in video request validator.', err)
+ return res.sendStatus(500)
+ })
}
function checkUserCanDeleteVideo (userId: number, res: express.Response, callback: () => void) {
// Retrieve the user who did the request
- db.User.loadById(userId, function (err, user) {
- if (err) {
- logger.error('Error in video request validator.', { error: err })
- return res.sendStatus(500)
- }
-
- // Check if the user can delete the video
- // The user can delete it if s/he is an admin
- // Or if s/he is the video's author
- if (user.isAdmin() === false) {
- if (res.locals.video.isOwned() === false) {
- return res.status(403).send('Cannot remove video of another pod')
- }
-
- if (res.locals.video.Author.userId !== res.locals.oauth.token.User.id) {
- return res.status(403).send('Cannot remove video of another user')
+ db.User.loadById(userId)
+ .then(user => {
+ // Check if the user can delete the video
+ // The user can delete it if s/he is an admin
+ // Or if s/he is the video's author
+ if (user.isAdmin() === false) {
+ if (res.locals.video.isOwned() === false) {
+ return res.status(403).send('Cannot remove video of another pod')
+ }
+
+ if (res.locals.video.Author.userId !== res.locals.oauth.token.User.id) {
+ return res.status(403).send('Cannot remove video of another user')
+ }
}
- }
- // If we reach this comment, we can delete the video
- callback()
- })
+ // If we reach this comment, we can delete the video
+ callback()
+ })
+ .catch(err => {
+ logger.error('Error in video request validator.', err)
+ return res.sendStatus(500)
+ })
}
function checkVideoIsBlacklistable (req: express.Request, res: express.Response, callback: () => void) {
projects / github / Chocobozzz / PeerTube.git / blobdiff