-import { values } from 'lodash'
-import * as validator from 'validator'
-import * as Promise from 'bluebird'
-import * as express from 'express'
+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_LICENCES,
VIDEO_LANGUAGES,
- VIDEO_RATE_TYPES,
+ VIDEO_LICENCES, VIDEO_MIMETYPE_EXT,
VIDEO_PRIVACIES,
- database as db
+ VIDEO_RATE_TYPES
} from '../../initializers'
-import { isUserUsernameValid } from './users'
-import { isArray, exists } from './misc'
-import { VideoInstance } from '../../models'
-import { logger } from '../../helpers'
-import { VideoRateType } from '../../../shared'
-import { isActivityPubUrlValid } from './activitypub/misc'
+import { VideoModel } from '../../models/video/video'
+import { exists, isArray, isFileValid } 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 isVideoCategoryValid (value: number) {
- return VIDEO_CATEGORIES[value] !== undefined
-}
-
-// Maybe we don't know the remote category, but that doesn't matter
-function isRemoteVideoCategoryValid (value: string) {
- return validator.isInt('' + value)
-}
-
-function isVideoUrlValid (value: string) {
- return isActivityPubUrlValid(value)
+ return value === null || VIDEO_CATEGORIES[value] !== undefined
}
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)
+ return value === null || VIDEO_LICENCES[value] !== undefined
}
function isVideoLanguageValid (value: number) {
return value === null || VIDEO_LANGUAGES[value] !== undefined
}
-// Maybe we don't know the remote language, but that doesn't matter
-function isRemoteVideoLanguageValid (value: string) {
- return validator.isInt('' + value)
-}
-
-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 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 isVideoDurationValid (value: string) {
- // https://www.w3.org/TR/activitystreams-vocabulary/#dfn-duration
- return exists(value) &&
- typeof value === 'string' &&
- value.startsWith('PT') &&
- value.endsWith('S') &&
- validator.isInt(value.replace(/[^0-9]+/, ''), VIDEOS_CONSTRAINTS_FIELDS.DURATION)
+function isVideoSupportValid (value: string) {
+ return value === null || (exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.SUPPORT))
}
function isVideoNameValid (value: string) {
tags.every(tag => isVideoTagValid(tag))
}
-function isVideoThumbnailValid (value: string) {
- return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.THUMBNAIL)
-}
-
-function isVideoThumbnailDataValid (value: string) {
- return exists(value) && validator.isByteLength(value, VIDEOS_CONSTRAINTS_FIELDS.THUMBNAIL_DATA)
-}
-
function isVideoAbuseReasonValid (value: string) {
return exists(value) && validator.isLength(value, VIDEO_ABUSES_CONSTRAINTS_FIELDS.REASON)
}
return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.VIEWS)
}
-function isVideoLikesValid (value: string) {
- return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.LIKES)
-}
-
-function isVideoDislikesValid (value: string) {
- return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.DISLIKES)
-}
-
-function isVideoEventCountValid (value: string) {
- return exists(value) && validator.isInt(value + '', VIDEO_EVENTS_CONSTRAINTS_FIELDS.COUNT)
-}
-
function isVideoRatingTypeValid (value: string) {
- return values(VIDEO_RATE_TYPES).indexOf(value as VideoRateType) !== -1
+ return value === 'none' || values(VIDEO_RATE_TYPES).indexOf(value as VideoRateType) !== -1
}
+const videoFileTypes = Object.keys(VIDEO_MIMETYPE_EXT).map(m => `(${m})`)
+const videoFileTypesRegex = videoFileTypes.join('|')
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']
- if (!videofile || videofile.length === 0) return false
+ return isFileValid(files, videoFileTypesRegex, 'videofile')
+}
- // 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})`
+function isVideoImage (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[], field: string) {
+ return isFileValid(files, videoImageTypesRegex, field, true)
+}
- return new RegExp('^video/(webm|mp4|ogg)$', 'i').test(file.mimetype)
+function isVideoPrivacyValid (value: string) {
+ return validator.isInt(value + '') && VIDEO_PRIVACIES[value] !== undefined
}
-function isVideoFileSizeValid (value: string) {
- return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.FILE_SIZE)
+function isVideoFileInfoHashValid (value: string) {
+ return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.INFO_HASH)
}
function isVideoFileResolutionValid (value: string) {
return exists(value) && validator.isInt(value + '')
}
-function isVideoFileExtnameValid (value: string) {
- return VIDEOS_CONSTRAINTS_FIELDS.EXTNAME.indexOf(value) !== -1
+function isVideoFileSizeValid (value: string) {
+ return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.FILE_SIZE)
}
-function isVideoFileInfoHashValid (value: string) {
- return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.INFO_HASH)
-}
+async function isVideoExist (id: string, res: Response) {
+ let video: VideoModel
-function checkVideoExists (id: string, res: express.Response, callback: () => void) {
- let promise: Promise<VideoInstance>
if (validator.isInt(id)) {
- promise = db.Video.loadAndPopulateAccountAndServerAndTags(+id)
+ video = await VideoModel.loadAndPopulateAccountAndServerAndTags(+id)
} else { // UUID
- promise = db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(id)
+ video = await VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(id)
}
- promise.then(video => {
- if (!video) {
- return res.status(404)
- .json({ error: 'Video not found' })
- .end()
- }
+ if (!video) {
+ res.status(404)
+ .json({ error: 'Video not found' })
+ .end()
+
+ return false
+ }
- res.locals.video = video
- callback()
- })
- .catch(err => {
- logger.error('Error in video request validator.', err)
- return res.sendStatus(500)
- })
+ res.locals.video = video
+ return true
}
// ---------------------------------------------------------------------------
isVideoCategoryValid,
isVideoLicenceValid,
isVideoLanguageValid,
- isVideoNSFWValid,
isVideoTruncatedDescriptionValid,
isVideoDescriptionValid,
- isVideoDurationValid,
isVideoFileInfoHashValid,
isVideoNameValid,
isVideoTagsValid,
- isVideoThumbnailValid,
- isVideoThumbnailDataValid,
- isVideoFileExtnameValid,
isVideoAbuseReasonValid,
isVideoFile,
isVideoViewsValid,
- isVideoLikesValid,
isVideoRatingTypeValid,
- isVideoDislikesValid,
- isVideoEventCountValid,
- isVideoFileSizeValid,
+ isVideoDurationValid,
+ isVideoTagValid,
isVideoPrivacyValid,
- isRemoteVideoPrivacyValid,
isVideoFileResolutionValid,
- checkVideoExists,
- isVideoTagValid,
- isRemoteVideoCategoryValid,
- isRemoteVideoLicenceValid,
- isVideoUrlValid,
- isRemoteVideoLanguageValid
+ isVideoFileSizeValid,
+ isVideoExist,
+ isVideoImage,
+ isVideoSupportValid
}
projects / oweals / peertube.git / blobdiff