X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Fvideos.ts;h=07aadadb100f3596d0008d43def68431bd409f43;hb=40ff57078e15d5b86ee6b71e198b95d3feb78eaf;hp=62132acb12b5bb389ac9df1c67027dad9bb630fb;hpb=075f16caac5236cb04c98ae7b3a989766d764bb3;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts
index 62132acb1..07aadadb1 100644
--- a/server/helpers/custom-validators/videos.ts
+++ b/server/helpers/custom-validators/videos.ts
@@ -1,76 +1,96 @@
+import * as Promise from 'bluebird'
+import * as express from 'express'
+import 'express-validator'
 import { values } from 'lodash'
-import * as validator from 'validator'
 import 'multer'
-
+import * as validator from 'validator'
+import { VideoRateType } from '../../../shared'
+import { logger } from '../../helpers'
 import {
   CONSTRAINTS_FIELDS,
+  database as db,
   VIDEO_CATEGORIES,
-  VIDEO_LICENCES,
   VIDEO_LANGUAGES,
+  VIDEO_LICENCES,
+  VIDEO_PRIVACIES,
   VIDEO_RATE_TYPES
 } from '../../initializers'
-import { isUserUsernameValid } from './users'
-import { isArray, exists } from './misc'
-import { VideoRateType } from '../../../shared'
+import { VideoInstance } from '../../models'
+import { isActivityPubUrlValid } from './activitypub/misc'
+import { exists, isArray } from './misc'
 
 const VIDEOS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEOS
 const VIDEO_ABUSES_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_ABUSES
 const VIDEO_EVENTS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_EVENTS
 
-function isVideoIdOrUUIDValid (value: string) {
-  return validator.isInt(value) || isVideoUUIDValid(value)
+function isVideoCategoryValid (value: number) {
+  return VIDEO_CATEGORIES[value] !== undefined
 }
 
-function isVideoAuthorValid (value: string) {
-  return isUserUsernameValid(value)
+// Maybe we don't know the remote category, but that doesn't matter
+function isRemoteVideoCategoryValid (value: string) {
+  return validator.isInt('' + value)
 }
 
-function isVideoDateValid (value: string) {
-  return exists(value) && validator.isISO8601(value)
-}
-
-function isVideoCategoryValid (value: number) {
-  return VIDEO_CATEGORIES[value] !== undefined
+function isVideoUrlValid (value: string) {
+  return isActivityPubUrlValid(value)
 }
 
 function isVideoLicenceValid (value: number) {
   return VIDEO_LICENCES[value] !== undefined
 }
 
+function isVideoPrivacyValid (value: string) {
+  return VIDEO_PRIVACIES[value] !== undefined
+}
+
+// Maybe we don't know the remote privacy setting, but that doesn't matter
+function isRemoteVideoPrivacyValid (value: string) {
+  return validator.isInt('' + value)
+}
+
+// Maybe we don't know the remote licence, but that doesn't matter
+function isRemoteVideoLicenceValid (value: string) {
+  return validator.isInt('' + value)
+}
+
 function isVideoLanguageValid (value: number) {
   return value === null || VIDEO_LANGUAGES[value] !== undefined
 }
 
-function isVideoNSFWValid (value: any) {
-  return typeof value === 'boolean' || (typeof value === 'string' && validator.isBoolean(value))
+// Maybe we don't know the remote language, but that doesn't matter
+function isRemoteVideoLanguageValid (value: string) {
+  return validator.isInt('' + value)
 }
 
-function isVideoDescriptionValid (value: string) {
-  return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.DESCRIPTION)
+function isVideoNSFWValid (value: any) {
+  return typeof value === 'boolean' || (typeof value === 'string' && validator.isBoolean(value))
 }
 
 function isVideoDurationValid (value: string) {
   return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.DURATION)
 }
 
-function isVideoExtnameValid (value: string) {
-  return VIDEOS_CONSTRAINTS_FIELDS.EXTNAME.indexOf(value) !== -1
+function isVideoTruncatedDescriptionValid (value: string) {
+  return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.TRUNCATED_DESCRIPTION)
 }
 
-function isVideoInfoHashValid (value: string) {
-  return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.INFO_HASH)
+function isVideoDescriptionValid (value: string) {
+  return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.DESCRIPTION)
 }
 
 function isVideoNameValid (value: string) {
   return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.NAME)
 }
 
+function isVideoTagValid (tag: string) {
+  return exists(tag) && validator.isLength(tag, VIDEOS_CONSTRAINTS_FIELDS.TAG)
+}
+
 function isVideoTagsValid (tags: string[]) {
   return isArray(tags) &&
          validator.isInt(tags.length.toString(), VIDEOS_CONSTRAINTS_FIELDS.TAGS) &&
-         tags.every(tag => {
-           return exists(tag) && validator.isLength(tag, VIDEOS_CONSTRAINTS_FIELDS.TAG)
-         })
+         tags.every(tag => isVideoTagValid(tag))
 }
 
 function isVideoThumbnailValid (value: string) {
@@ -81,18 +101,10 @@ function isVideoThumbnailDataValid (value: string) {
   return exists(value) && validator.isByteLength(value, VIDEOS_CONSTRAINTS_FIELDS.THUMBNAIL_DATA)
 }
 
-function isVideoUUIDValid (value: string) {
-  return exists(value) && validator.isUUID('' + value, 4)
-}
-
 function isVideoAbuseReasonValid (value: string) {
   return exists(value) && validator.isLength(value, VIDEO_ABUSES_CONSTRAINTS_FIELDS.REASON)
 }
 
-function isVideoAbuseReporterUsernameValid (value: string) {
-  return isUserUsernameValid(value)
-}
-
 function isVideoViewsValid (value: string) {
   return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.VIEWS)
 }
@@ -113,12 +125,13 @@ function isVideoRatingTypeValid (value: string) {
   return values(VIDEO_RATE_TYPES).indexOf(value as VideoRateType) !== -1
 }
 
-function isVideoFile (value: string, files: { [ fieldname: string ]: Express.Multer.File[] }) {
+function isVideoFile (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[]) {
   // Should have files
   if (!files) return false
+  if (isArray(files)) return false
 
   // Should have videofile file
-  const videofile = files.videofile
+  const videofile = files['videofile']
   if (!videofile || videofile.length === 0) return false
 
   // The file should exist
@@ -128,62 +141,77 @@ function isVideoFile (value: string, files: { [ fieldname: string ]: Express.Mul
   return new RegExp('^video/(webm|mp4|ogg)$', 'i').test(file.mimetype)
 }
 
+function isVideoFileSizeValid (value: string) {
+  return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.FILE_SIZE)
+}
+
+function isVideoFileResolutionValid (value: string) {
+  return exists(value) && validator.isInt(value + '')
+}
+
+function isVideoFileExtnameValid (value: string) {
+  return VIDEOS_CONSTRAINTS_FIELDS.EXTNAME.indexOf(value) !== -1
+}
+
+function isVideoFileInfoHashValid (value: string) {
+  return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.INFO_HASH)
+}
+
+function checkVideoExists (id: string, res: express.Response, callback: () => void) {
+  let promise: Promise<VideoInstance>
+  if (validator.isInt(id)) {
+    promise = db.Video.loadAndPopulateAccountAndServerAndTags(+id)
+  } else { // UUID
+    promise = db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(id)
+  }
+
+  promise.then(video => {
+    if (!video) {
+      return res.status(404)
+                .json({ error: 'Video not found' })
+                .end()
+    }
+
+    res.locals.video = video
+    callback()
+  })
+  .catch(err => {
+    logger.error('Error in video request validator.', err)
+    return res.sendStatus(500)
+  })
+}
+
 // ---------------------------------------------------------------------------
 
 export {
-  isVideoIdOrUUIDValid,
-  isVideoAuthorValid,
-  isVideoDateValid,
   isVideoCategoryValid,
   isVideoLicenceValid,
   isVideoLanguageValid,
   isVideoNSFWValid,
+  isVideoTruncatedDescriptionValid,
   isVideoDescriptionValid,
-  isVideoDurationValid,
-  isVideoInfoHashValid,
+  isVideoFileInfoHashValid,
   isVideoNameValid,
   isVideoTagsValid,
   isVideoThumbnailValid,
   isVideoThumbnailDataValid,
-  isVideoExtnameValid,
-  isVideoUUIDValid,
+  isVideoFileExtnameValid,
   isVideoAbuseReasonValid,
-  isVideoAbuseReporterUsernameValid,
   isVideoFile,
   isVideoViewsValid,
   isVideoLikesValid,
   isVideoRatingTypeValid,
   isVideoDislikesValid,
-  isVideoEventCountValid
-}
-
-declare global {
-  namespace ExpressValidator {
-    export interface Validator {
-      isVideoIdOrUUIDValid,
-      isVideoAuthorValid,
-      isVideoDateValid,
-      isVideoCategoryValid,
-      isVideoLicenceValid,
-      isVideoLanguageValid,
-      isVideoNSFWValid,
-      isVideoDescriptionValid,
-      isVideoDurationValid,
-      isVideoInfoHashValid,
-      isVideoNameValid,
-      isVideoTagsValid,
-      isVideoThumbnailValid,
-      isVideoThumbnailDataValid,
-      isVideoExtnameValid,
-      isVideoUUIDValid,
-      isVideoAbuseReasonValid,
-      isVideoAbuseReporterUsernameValid,
-      isVideoFile,
-      isVideoViewsValid,
-      isVideoLikesValid,
-      isVideoRatingTypeValid,
-      isVideoDislikesValid,
-      isVideoEventCountValid
-    }
-  }
+  isVideoEventCountValid,
+  isVideoFileSizeValid,
+  isVideoPrivacyValid,
+  isRemoteVideoPrivacyValid,
+  isVideoDurationValid,
+  isVideoFileResolutionValid,
+  checkVideoExists,
+  isVideoTagValid,
+  isRemoteVideoCategoryValid,
+  isRemoteVideoLicenceValid,
+  isVideoUrlValid,
+  isRemoteVideoLanguageValid
 }