X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Fvideos.ts;h=87966798f435b41774fdc18fd42f46dcf1855d2c;hb=dc48fdbe68e9dd3a3a6028181e61d8595d98e654;hp=07aadadb100f3596d0008d43def68431bd409f43;hpb=79d5caf994edd87ad721994490f10677be277497;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts index 07aadadb1..87966798f 100644 --- a/server/helpers/custom-validators/videos.ts +++ b/server/helpers/custom-validators/videos.ts @@ -1,70 +1,40 @@ -import * as Promise from 'bluebird' -import * as express from 'express' -import 'express-validator' import { values } from 'lodash' -import 'multer' -import * as validator from 'validator' -import { VideoRateType } from '../../../shared' -import { logger } from '../../helpers' +import validator from 'validator' +import { VideoFilter, VideoPrivacy, VideoRateType } from '../../../shared' import { CONSTRAINTS_FIELDS, - database as db, + MIMETYPES, VIDEO_CATEGORIES, - VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_PRIVACIES, - VIDEO_RATE_TYPES -} from '../../initializers' -import { VideoInstance } from '../../models' -import { isActivityPubUrlValid } from './activitypub/misc' -import { exists, isArray } from './misc' + VIDEO_RATE_TYPES, + VIDEO_STATES, + VIDEO_LIVE +} from '../../initializers/constants' +import { exists, isArray, isDateValid, isFileMimeTypeValid, 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 -const VIDEO_EVENTS_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_EVENTS -function isVideoCategoryValid (value: number) { - return VIDEO_CATEGORIES[value] !== undefined +function isVideoFilterValid (filter: VideoFilter) { + return filter === 'local' || filter === 'all-local' || filter === 'all' } -// Maybe we don't know the remote category, but that doesn't matter -function isRemoteVideoCategoryValid (value: string) { - return validator.isInt('' + value) +function isVideoCategoryValid (value: any) { + return value === null || VIDEO_CATEGORIES[value] !== undefined } -function isVideoUrlValid (value: string) { - return isActivityPubUrlValid(value) +function isVideoStateValid (value: any) { + return exists(value) && VIDEO_STATES[value] !== undefined } -function isVideoLicenceValid (value: number) { - return VIDEO_LICENCES[value] !== undefined +function isVideoLicenceValid (value: any) { + return value === null || 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 -} - -// 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 isVideoLanguageValid (value: any) { + return value === null || + (typeof value === 'string' && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.LANGUAGE)) } function isVideoDurationValid (value: string) { @@ -76,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) { @@ -88,97 +62,71 @@ 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)) + return tags === null || ( + isArray(tags) && + validator.isInt(tags.length.toString(), VIDEOS_CONSTRAINTS_FIELDS.TAGS) && + tags.every(tag => isVideoTagValid(tag)) + ) } -function isVideoThumbnailValid (value: string) { - return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.THUMBNAIL) +function isVideoViewsValid (value: string) { + return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.VIEWS) } -function isVideoThumbnailDataValid (value: string) { - return exists(value) && validator.isByteLength(value, VIDEOS_CONSTRAINTS_FIELDS.THUMBNAIL_DATA) +function isVideoRatingTypeValid (value: string) { + return value === 'none' || values(VIDEO_RATE_TYPES).includes(value as VideoRateType) } -function isVideoAbuseReasonValid (value: string) { - return exists(value) && validator.isLength(value, VIDEO_ABUSES_CONSTRAINTS_FIELDS.REASON) +function isVideoFileExtnameValid (value: string) { + return exists(value) && (value === VIDEO_LIVE.EXTENSION || MIMETYPES.VIDEO.EXT_MIMETYPE[value] !== undefined) } -function isVideoViewsValid (value: string) { - return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.VIEWS) +function isVideoFileMimeTypeValid (files: { [ fieldname: string ]: Express.Multer.File[] } | Express.Multer.File[]) { + return isFileMimeTypeValid(files, MIMETYPES.VIDEO.MIMETYPES_REGEX, 'videofile') } -function isVideoLikesValid (value: string) { - return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.LIKES) -} +const videoImageTypes = CONSTRAINTS_FIELDS.VIDEOS.IMAGE.EXTNAME + .map(v => v.replace('.', '')) + .join('|') +const videoImageTypesRegex = `image/(${videoImageTypes})` -function isVideoDislikesValid (value: string) { - return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.DISLIKES) +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 isVideoEventCountValid (value: string) { - return exists(value) && validator.isInt(value + '', VIDEO_EVENTS_CONSTRAINTS_FIELDS.COUNT) +function isVideoPrivacyValid (value: number) { + return VIDEO_PRIVACIES[value] !== undefined } -function isVideoRatingTypeValid (value: string) { - return values(VIDEO_RATE_TYPES).indexOf(value as VideoRateType) !== -1 +function isScheduleVideoUpdatePrivacyValid (value: number) { + return value === VideoPrivacy.UNLISTED || value === VideoPrivacy.PUBLIC || value === VideoPrivacy.INTERNAL } -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 - - // The file should exist - const file = videofile[0] - if (!file || !file.originalname) return false - - return new RegExp('^video/(webm|mp4|ogg)$', 'i').test(file.mimetype) +function isVideoOriginallyPublishedAtValid (value: string | null) { + return value === null || isDateValid(value) } -function isVideoFileSizeValid (value: string) { - return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.FILE_SIZE) +function isVideoFileInfoHashValid (value: string | null | undefined) { + 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 isVideoFPSResolutionValid (value: string) { + return value === null || validator.isInt(value + '') } -function isVideoFileInfoHashValid (value: string) { - return exists(value) && validator.isLength(value, VIDEOS_CONSTRAINTS_FIELDS.INFO_HASH) +function isVideoFileSizeValid (value: string) { + return exists(value) && validator.isInt(value + '', VIDEOS_CONSTRAINTS_FIELDS.FILE_SIZE) } -function checkVideoExists (id: string, res: express.Response, callback: () => void) { - let promise: Promise - 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() - } +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) } // --------------------------------------------------------------------------- @@ -187,31 +135,26 @@ export { isVideoCategoryValid, isVideoLicenceValid, isVideoLanguageValid, - isVideoNSFWValid, isVideoTruncatedDescriptionValid, isVideoDescriptionValid, isVideoFileInfoHashValid, isVideoNameValid, isVideoTagsValid, - isVideoThumbnailValid, - isVideoThumbnailDataValid, - isVideoFileExtnameValid, - isVideoAbuseReasonValid, - isVideoFile, + isVideoFPSResolutionValid, + isScheduleVideoUpdatePrivacyValid, + isVideoOriginallyPublishedAtValid, + isVideoMagnetUriValid, + isVideoStateValid, isVideoViewsValid, - isVideoLikesValid, isVideoRatingTypeValid, - isVideoDislikesValid, - isVideoEventCountValid, - isVideoFileSizeValid, - isVideoPrivacyValid, - isRemoteVideoPrivacyValid, + isVideoFileExtnameValid, + isVideoFileMimeTypeValid, isVideoDurationValid, - isVideoFileResolutionValid, - checkVideoExists, isVideoTagValid, - isRemoteVideoCategoryValid, - isRemoteVideoLicenceValid, - isVideoUrlValid, - isRemoteVideoLanguageValid + isVideoPrivacyValid, + isVideoFileResolutionValid, + isVideoFileSizeValid, + isVideoImage, + isVideoSupportValid, + isVideoFilterValid }