X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fvideos%2Fvideo-imports.ts;h=d69aff1180322252233cd2720eb98430a665c2e1;hb=faa9d434b4d681837ff2a87603337c2623419669;hp=5dc5db5338fd8250e6bcceb79d022ac9eb85a5ba;hpb=7024e9120b381b5b3201212f5a18f5cdc14e15ff;p=oweals%2Fpeertube.git diff --git a/server/middlewares/validators/videos/video-imports.ts b/server/middlewares/validators/videos/video-imports.ts index 5dc5db533..d69aff118 100644 --- a/server/middlewares/validators/videos/video-imports.ts +++ b/server/middlewares/validators/videos/video-imports.ts @@ -1,15 +1,18 @@ import * as express from 'express' import { body } from 'express-validator' +import { isPreImportVideoAccepted } from '@server/lib/moderation' +import { Hooks } from '@server/lib/plugins/hooks' +import { VideoImportCreate } from '@shared/models/videos/import/video-import-create.model' import { isIdValid, toIntOrNull } from '../../../helpers/custom-validators/misc' -import { logger } from '../../../helpers/logger' -import { areValidationErrors } from '../utils' -import { getCommonVideoEditAttributes } from './videos' import { isVideoImportTargetUrlValid, isVideoImportTorrentFile } from '../../../helpers/custom-validators/video-imports' -import { cleanUpReqFiles } from '../../../helpers/express-utils' import { isVideoMagnetUriValid, isVideoNameValid } from '../../../helpers/custom-validators/videos' +import { cleanUpReqFiles } from '../../../helpers/express-utils' +import { logger } from '../../../helpers/logger' +import { doesVideoChannelOfAccountExist } from '../../../helpers/middlewares' import { CONFIG } from '../../../initializers/config' import { CONSTRAINTS_FIELDS } from '../../../initializers/constants' -import { doesVideoChannelOfAccountExist } from '../../../helpers/middlewares' +import { areValidationErrors } from '../utils' +import { getCommonVideoEditAttributes } from './videos' const videoImportAddValidator = getCommonVideoEditAttributes().concat([ body('channelId') @@ -35,7 +38,7 @@ const videoImportAddValidator = getCommonVideoEditAttributes().concat([ logger.debug('Checking videoImportAddValidator parameters', { parameters: req.body }) const user = res.locals.oauth.token.User - const torrentFile = req.files && req.files['torrentfile'] ? req.files['torrentfile'][0] : undefined + const torrentFile = req.files?.['torrentfile'] ? req.files['torrentfile'][0] : undefined if (areValidationErrors(req, res)) return cleanUpReqFiles(req) @@ -64,6 +67,8 @@ const videoImportAddValidator = getCommonVideoEditAttributes().concat([ .end() } + if (!await isImportAccepted(req, res)) return cleanUpReqFiles(req) + return next() } ]) @@ -75,3 +80,31 @@ export { } // --------------------------------------------------------------------------- + +async function isImportAccepted (req: express.Request, res: express.Response) { + const body: VideoImportCreate = req.body + const hookName = body.targetUrl + ? 'filter:api.video.pre-import-url.accept.result' + : 'filter:api.video.pre-import-torrent.accept.result' + + // Check we accept this video + const acceptParameters = { + videoImportBody: body, + user: res.locals.oauth.token.User + } + const acceptedResult = await Hooks.wrapFun( + isPreImportVideoAccepted, + acceptParameters, + hookName + ) + + if (!acceptedResult || acceptedResult.accepted !== true) { + logger.info('Refused to import video.', { acceptedResult, acceptParameters }) + res.status(403) + .json({ error: acceptedResult.errorMessage || 'Refused to import video' }) + + return false + } + + return true +}