X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2FreqValidators%2Fvideos.js;h=10b6d39c6f9989a575be76ad7316b804773d1b74;hb=1cdb5c0f582502eac4d851cecc015e81cf16316b;hp=4057e72cd3a75996243b974740bf011386226170;hpb=f0f5567b6918fc60c8cab15e13aec03a89a91dfb;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/reqValidators/videos.js b/server/middlewares/reqValidators/videos.js
index 4057e72cd..10b6d39c6 100644
--- a/server/middlewares/reqValidators/videos.js
+++ b/server/middlewares/reqValidators/videos.js
@@ -1,6 +1,7 @@
 'use strict'
 
 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')
@@ -13,14 +14,29 @@ const 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 (max: ' + constants.MAXIMUM_VIDEO_DURATION + 's).')
+      }
+
+      videoFile.duration = duration
+      next()
+    })
+  })
 }
 
 function videosGet (req, res, next) {
@@ -35,11 +51,10 @@ function videosGet (req, res, next) {
         res.sendStatus(500)
       }
 
-      videos.getVideoState(video, function (state) {
-        if (state.exist === false) return res.status(404).send('Video not found')
+      const state = videos.getVideoState(video)
+      if (state.exist === false) return res.status(404).send('Video not found')
 
-        next()
-      })
+      next()
     })
   })
 }
@@ -56,18 +71,19 @@ function videosRemove (req, res, next) {
         res.sendStatus(500)
       }
 
-      videos.getVideoState(video, function (state) {
-        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')
+      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')
 
-        next()
-      })
+      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 })