X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2FreqValidators%2Fvideos.js;h=d444c9f0abd8b11dba3f308d2727dfc953595ead;hb=46246b5f194caafba4e3a72e9365acd8b35785de;hp=4e5f4391fe44e645d69bdf2f7ea9766a33fac9d6;hpb=b9a3e09ad5a7673f64556d1dba122ed4c4fac980;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/reqValidators/videos.js b/server/middlewares/reqValidators/videos.js
index 4e5f4391f..d444c9f0a 100644
--- a/server/middlewares/reqValidators/videos.js
+++ b/server/middlewares/reqValidators/videos.js
@@ -1,10 +1,12 @@
 'use strict'
 
-var checkErrors = require('./utils').checkErrors
-var logger = require('../../helpers/logger')
-var Videos = require('../../models/videos')
+const checkErrors = require('./utils').checkErrors
+const constants = require('../../initializers/constants')
+const logger = require('../../helpers/logger')
+const videos = require('../../lib/videos')
+const Videos = require('../../models/videos')
 
-var reqValidatorsVideos = {
+const reqValidatorsVideos = {
   videosAdd: videosAdd,
   videosGet: videosGet,
   videosRemove: videosRemove,
@@ -12,14 +14,29 @@ var reqValidatorsVideos = {
 }
 
 function videosAdd (req, res, next) {
-  req.checkFiles('input_video[0].originalname', 'Should have an input video').notEmpty()
-  req.checkFiles('input_video[0].mimetype', 'Should have a correct mime type').matches(/video\/(webm)|(mp4)|(ogg)/i)
+  req.checkFiles('videofile[0].originalname', 'Should have an input video').notEmpty()
+  req.checkFiles('videofile[0].mimetype', 'Should have a correct mime type').matches(/video\/(webm)|(mp4)|(ogg)/i)
   req.checkBody('name', 'Should have a name').isLength(1, 50)
   req.checkBody('description', 'Should have a description').isLength(1, 250)
 
   logger.debug('Checking videosAdd parameters', { parameters: req.body, files: req.files })
 
-  checkErrors(req, res, next)
+  checkErrors(req, res, function () {
+    const videoFile = req.files.videofile[0]
+
+    videos.getVideoDuration(videoFile.path, function (err, duration) {
+      if (err) {
+        return res.status(400).send('Cannot retrieve metadata of the file.')
+      }
+
+      if (duration > constants.MAXIMUM_VIDEO_DURATION) {
+        return res.status(400).send('Duration of the video file is too big (' + constants.MAXIMUM_VIDEO_DURATION + ').')
+      }
+
+      videoFile.duration = duration
+      next()
+    })
+  })
 }
 
 function videosGet (req, res, next) {
@@ -28,12 +45,13 @@ function videosGet (req, res, next) {
   logger.debug('Checking videosGet parameters', { parameters: req.params })
 
   checkErrors(req, res, function () {
-    Videos.getVideoState(req.params.id, function (err, state) {
+    Videos.get(req.params.id, function (err, video) {
       if (err) {
         logger.error('Error in videosGet request validator.', { error: err })
         res.sendStatus(500)
       }
 
+      const state = videos.getVideoState(video)
       if (state.exist === false) return res.status(404).send('Video not found')
 
       next()
@@ -47,12 +65,13 @@ function videosRemove (req, res, next) {
   logger.debug('Checking videosRemove parameters', { parameters: req.params })
 
   checkErrors(req, res, function () {
-    Videos.getVideoState(req.params.id, function (err, state) {
+    Videos.get(req.params.id, function (err, video) {
       if (err) {
         logger.error('Error in videosRemove request validator.', { error: err })
         res.sendStatus(500)
       }
 
+      const state = videos.getVideoState(video)
       if (state.exist === false) return res.status(404).send('Video not found')
       else if (state.owned === false) return res.status(403).send('Cannot remove video of another pod')
 
@@ -62,7 +81,9 @@ function videosRemove (req, res, next) {
 }
 
 function videosSearch (req, res, next) {
-  req.checkParams('name', 'Should have a name').notEmpty()
+  const searchableColumns = constants.SEARCHABLE_COLUMNS.VIDEOS
+  req.checkParams('value', 'Should have a name').notEmpty()
+  req.checkQuery('field', 'Should have correct searchable column').optional().isIn(searchableColumns)
 
   logger.debug('Checking videosSearch parameters', { parameters: req.params })