X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Fvideos.ts;h=60e8075f6466ca0388d9151ec0624b167c27d1ac;hb=3b0bd70aa05ab82fa30fe67ed4899d44652c703a;hp=c893d2c7cf54c8b88f6f831380222e4cf71783df;hpb=8d468a16fd33ec2660c3c59b3f7def53eb0cc4a1;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts index c893d2c7c..60e8075f6 100644 --- a/server/helpers/custom-validators/videos.ts +++ b/server/helpers/custom-validators/videos.ts @@ -1,39 +1,39 @@ -import * as Bluebird from 'bluebird' -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 { database as db } from '../../initializers/database' -import { VideoInstance } from '../../models/video/video-interface' -import { logger } from '../logger' -import { isActivityPubUrlValid } from './activitypub/misc' -import { exists, isArray } from './misc' -import { VIDEO_PRIVACIES } from '../../initializers/constants' +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 +} 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 isVideoUrlValid (value: string) { - return isActivityPubUrlValid(value) +function isVideoCategoryValid (value: any) { + return value === null || VIDEO_CATEGORIES[value] !== undefined } -function isVideoLicenceValid (value: number) { - return VIDEO_LICENCES[value] !== undefined +function isVideoStateValid (value: any) { + return exists(value) && VIDEO_STATES[value] !== undefined } -function isVideoLanguageValid (value: number) { - return value === null || VIDEO_LANGUAGES[value] !== undefined +function isVideoLicenceValid (value: any) { + return value === null || VIDEO_LICENCES[value] !== undefined } -function isVideoNSFWValid (value: any) { - return typeof value === 'boolean' || (typeof value === 'string' && validator.isBoolean(value)) +function isVideoLanguageValid (value: any) { + return value === null || + (typeof value === 'string' && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.LANGUAGE)) } function isVideoDurationValid (value: string) { @@ -45,7 +45,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) { @@ -57,13 +61,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) { @@ -71,55 +73,63 @@ 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 isVideoFileExtnameValid (value: string) { + return exists(value) && MIMETYPES.VIDEO.EXT_MIMETYPE[value] !== undefined } function isVideoFile (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[]) { - // Should have files - if (!files) return false - if (isArray(files)) return false + const videoFileTypesRegex = Object.keys(MIMETYPES.VIDEO.MIMETYPE_EXT) + .map(m => `(${m})`) + .join('|') + + return isFileValid(files, videoFileTypesRegex, 'videofile', null) +} + +const videoImageTypes = CONSTRAINTS_FIELDS.VIDEOS.IMAGE.EXTNAME + .map(v => v.replace('.', '')) + .join('|') +const videoImageTypesRegex = `image/(${videoImageTypes})` - // Should have videofile file - const videofile = files['videofile'] - if (!videofile || videofile.length === 0) return false +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) +} - // The file should exist - const file = videofile[0] - if (!file || !file.originalname) return false +function isVideoPrivacyValid (value: number) { + return VIDEO_PRIVACIES[value] !== undefined +} + +function isScheduleVideoUpdatePrivacyValid (value: number) { + return value === VideoPrivacy.UNLISTED || value === VideoPrivacy.PUBLIC || value === VideoPrivacy.INTERNAL +} - return new RegExp('^video/(webm|mp4|ogg)$', 'i').test(file.mimetype) +function isVideoOriginallyPublishedAtValid (value: string | null) { + return value === null || isDateValid(value) } -function isVideoFileInfoHashValid (value: string) { +function isVideoFileInfoHashValid (value: string | null | undefined) { return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.INFO_HASH) } -function isVideoPrivacyValid (value: string) { - return VIDEO_PRIVACIES[value] !== undefined +function isVideoFileResolutionValid (value: string) { + return exists(value) && validator.isInt(value + '') +} + +function isVideoFPSResolutionValid (value: string) { + return value === null || validator.isInt(value + '') } -function checkVideoExists (id: string, res: Response, callback: () => void) { - let promise: Bluebird - if (validator.isInt(id)) { - promise = db.Video.loadAndPopulateAccountAndServerAndTags(+id) - } else { // UUID - promise = db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(id) - } +function isVideoFileSizeValid (value: string) { + return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.FILE_SIZE) +} - promise.then(video => { - if (!video) { - return res.status(404) - .json({ error: 'Video not found' }) - .end() - } +function isVideoMagnetUriValid (value: string) { + if (!exists(value)) return false - res.locals.video = video - callback() - }) - .catch(err => { - logger.error('Error in video request validator.', err) - return res.sendStatus(500) - }) + const parsed = magnetUtil.decode(value) + return parsed && isVideoFileInfoHashValid(parsed.infoHash) } // --------------------------------------------------------------------------- @@ -128,19 +138,26 @@ export { isVideoCategoryValid, isVideoLicenceValid, isVideoLanguageValid, - isVideoNSFWValid, isVideoTruncatedDescriptionValid, isVideoDescriptionValid, isVideoFileInfoHashValid, isVideoNameValid, isVideoTagsValid, - isVideoAbuseReasonValid, + isVideoFPSResolutionValid, + isScheduleVideoUpdatePrivacyValid, + isVideoOriginallyPublishedAtValid, isVideoFile, + isVideoMagnetUriValid, + isVideoStateValid, isVideoViewsValid, isVideoRatingTypeValid, + isVideoFileExtnameValid, isVideoDurationValid, isVideoTagValid, - isVideoUrlValid, isVideoPrivacyValid, - checkVideoExists + isVideoFileResolutionValid, + isVideoFileSizeValid, + isVideoImage, + isVideoSupportValid, + isVideoFilterValid }