X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Fvideos.ts;h=e99992236b5f2dca67c0872369d5a7ee3c6f1805;hb=de6310b2fcbb8a6b79c546b23dfa1920724faaa7;hp=f13178c54d62fc195a176a985b9aea0184fa5eb4;hpb=a2431b7dcbc72c05101dcdbe631ff84a823aeb51;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts
index f13178c54..e99992236 100644
--- a/server/helpers/custom-validators/videos.ts
+++ b/server/helpers/custom-validators/videos.ts
@@ -1,32 +1,40 @@
-import { Response } from 'express'
-import 'express-validator'
 import { values } from 'lodash'
-import 'multer'
-import * as validator from 'validator'
-import { VideoRateType } from '../../../shared'
-import { CONSTRAINTS_FIELDS, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_RATE_TYPES } from '../../initializers'
-import { VIDEO_PRIVACIES } from '../../initializers/constants'
-import { database as db } from '../../initializers/database'
-import { VideoInstance } from '../../models/video/video-interface'
-import { exists, isArray } from './misc'
+import validator from 'validator'
+import { VideoFilter, VideoPrivacy, VideoRateType } from '../../../shared'
+import {
+  CONSTRAINTS_FIELDS,
+  MIMETYPES,
+  VIDEO_CATEGORIES,
+  VIDEO_LICENCES,
+  VIDEO_PRIVACIES,
+  VIDEO_RATE_TYPES,
+  VIDEO_STATES,
+  VIDEO_LIVE
+} from '../../initializers/constants'
+import { exists, isArray, isDateValid, isFileValid } from './misc'
+import * as magnetUtil from 'magnet-uri'
 
 const VIDEOS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEOS
-const VIDEO_ABUSES_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_ABUSES
 
-function isVideoCategoryValid (value: number) {
-  return VIDEO_CATEGORIES[value] !== undefined
+function isVideoFilterValid (filter: VideoFilter) {
+  return filter === 'local' || filter === 'all-local'
 }
 
-function isVideoLicenceValid (value: number) {
-  return VIDEO_LICENCES[value] !== undefined
+function isVideoCategoryValid (value: any) {
+  return value === null || VIDEO_CATEGORIES[value] !== undefined
 }
 
-function isVideoLanguageValid (value: number) {
-  return value === null || VIDEO_LANGUAGES[value] !== undefined
+function isVideoStateValid (value: any) {
+  return exists(value) && VIDEO_STATES[value] !== undefined
 }
 
-function isVideoNSFWValid (value: any) {
-  return typeof value === 'boolean' || (typeof value === 'string' && validator.isBoolean(value))
+function isVideoLicenceValid (value: any) {
+  return value === null || VIDEO_LICENCES[value] !== undefined
+}
+
+function isVideoLanguageValid (value: any) {
+  return value === null ||
+    (typeof value === 'string' && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.LANGUAGE))
 }
 
 function isVideoDurationValid (value: string) {
@@ -38,7 +46,11 @@ function isVideoTruncatedDescriptionValid (value: string) {
 }
 
 function isVideoDescriptionValid (value: string) {
-  return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.DESCRIPTION)
+  return value === null || (exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.DESCRIPTION))
+}
+
+function isVideoSupportValid (value: string) {
+  return value === null || (exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.SUPPORT))
 }
 
 function isVideoNameValid (value: string) {
@@ -50,13 +62,11 @@ function isVideoTagValid (tag: string) {
 }
 
 function isVideoTagsValid (tags: string[]) {
-  return isArray(tags) &&
-         validator.isInt(tags.length.toString(), VIDEOS_CONSTRAINTS_FIELDS.TAGS) &&
-         tags.every(tag => isVideoTagValid(tag))
-}
-
-function isVideoAbuseReasonValid (value: string) {
-  return exists(value) && validator.isLength(value, VIDEO_ABUSES_CONSTRAINTS_FIELDS.REASON)
+  return tags === null || (
+    isArray(tags) &&
+    validator.isInt(tags.length.toString(), VIDEOS_CONSTRAINTS_FIELDS.TAGS) &&
+    tags.every(tag => isVideoTagValid(tag))
+  )
 }
 
 function isVideoViewsValid (value: string) {
@@ -64,30 +74,39 @@ function isVideoViewsValid (value: string) {
 }
 
 function isVideoRatingTypeValid (value: string) {
-  return values(VIDEO_RATE_TYPES).indexOf(value as VideoRateType) !== -1
+  return value === 'none' || values(VIDEO_RATE_TYPES).includes(value as VideoRateType)
 }
 
-function isVideoFile (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[]) {
-  // Should have files
-  if (!files) return false
-  if (isArray(files)) return false
+function isVideoFileExtnameValid (value: string) {
+  return exists(value) && (value === VIDEO_LIVE.EXTENSION || MIMETYPES.VIDEO.EXT_MIMETYPE[value] !== undefined)
+}
 
-  // Should have videofile file
-  const videofile = files['videofile']
-  if (!videofile || videofile.length === 0) return false
+function isVideoFile (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[]) {
+  return isFileValid(files, MIMETYPES.VIDEO.MIMETYPES_REGEX, 'videofile', null)
+}
 
-  // The file should exist
-  const file = videofile[0]
-  if (!file || !file.originalname) return false
+const videoImageTypes = CONSTRAINTS_FIELDS.VIDEOS.IMAGE.EXTNAME
+                                          .map(v => v.replace('.', ''))
+                                          .join('|')
+const videoImageTypesRegex = `image/(${videoImageTypes})`
 
-  return new RegExp('^video/(webm|mp4|ogg)$', 'i').test(file.mimetype)
+function isVideoImage (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[], field: string) {
+  return isFileValid(files, videoImageTypesRegex, field, CONSTRAINTS_FIELDS.VIDEOS.IMAGE.FILE_SIZE.max, true)
 }
 
-function isVideoPrivacyValid (value: string) {
+function isVideoPrivacyValid (value: number) {
   return VIDEO_PRIVACIES[value] !== undefined
 }
 
-function isVideoFileInfoHashValid (value: string) {
+function isScheduleVideoUpdatePrivacyValid (value: number) {
+  return value === VideoPrivacy.UNLISTED || value === VideoPrivacy.PUBLIC || value === VideoPrivacy.INTERNAL
+}
+
+function isVideoOriginallyPublishedAtValid (value: string | null) {
+  return value === null || isDateValid(value)
+}
+
+function isVideoFileInfoHashValid (value: string | null | undefined) {
   return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.INFO_HASH)
 }
 
@@ -95,29 +114,19 @@ function isVideoFileResolutionValid (value: string) {
   return exists(value) && validator.isInt(value + '')
 }
 
+function isVideoFPSResolutionValid (value: string) {
+  return value === null || validator.isInt(value + '')
+}
+
 function isVideoFileSizeValid (value: string) {
   return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.FILE_SIZE)
 }
 
-async function isVideoExist (id: string, res: Response) {
-  let video: VideoInstance
-
-  if (validator.isInt(id)) {
-    video = await db.Video.loadAndPopulateAccountAndServerAndTags(+id)
-  } else { // UUID
-    video = await db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(id)
-  }
-
-  if (!video) {
-    res.status(404)
-      .json({ error: 'Video not found' })
-      .end()
-
-    return false
-  }
+function isVideoMagnetUriValid (value: string) {
+  if (!exists(value)) return false
 
-  res.locals.video = video
-  return true
+  const parsed = magnetUtil.decode(value)
+  return parsed && isVideoFileInfoHashValid(parsed.infoHash)
 }
 
 // ---------------------------------------------------------------------------
@@ -126,20 +135,26 @@ export {
   isVideoCategoryValid,
   isVideoLicenceValid,
   isVideoLanguageValid,
-  isVideoNSFWValid,
   isVideoTruncatedDescriptionValid,
   isVideoDescriptionValid,
   isVideoFileInfoHashValid,
   isVideoNameValid,
   isVideoTagsValid,
-  isVideoAbuseReasonValid,
+  isVideoFPSResolutionValid,
+  isScheduleVideoUpdatePrivacyValid,
+  isVideoOriginallyPublishedAtValid,
   isVideoFile,
+  isVideoMagnetUriValid,
+  isVideoStateValid,
   isVideoViewsValid,
   isVideoRatingTypeValid,
+  isVideoFileExtnameValid,
   isVideoDurationValid,
   isVideoTagValid,
   isVideoPrivacyValid,
   isVideoFileResolutionValid,
   isVideoFileSizeValid,
-  isVideoExist
+  isVideoImage,
+  isVideoSupportValid,
+  isVideoFilterValid
 }