ActivityPub-federated video streaming platform using P2P directly in your web browser
Prevent invalid end task for studio
Chocobozzz78885d7ad57e
diff --git a/packages/tests/src/api/check-params/video-studio.ts b/packages/tests/src/api/check-params/video-studio.tsindex d6a050d08d..f307a57f62 100644--- a/packages/tests/src/api/check-params/video-studio.ts+++ b/packages/tests/src/api/check-params/video-studio.ts@@ -249,7 +249,7 @@ describe('Test video studio API validator', function () {await cut(2, 2)})- it('Should fail with inconsistents start/end', async function () {+ it('Should fail with inconsistent start/end', async function () {await cut(2, 1)})@@ -257,6 +257,10 @@ describe('Test video studio API validator', function () {await cut(undefined, undefined)})+ it('Should fail with a bad end', async function () {+ await cut(undefined, 0)+ })+it('Should succeed with the correct params', async function () {this.timeout(360000)diff --git a/server/core/helpers/custom-validators/video-studio.ts b/server/core/helpers/custom-validators/video-studio.tsindex de94673203..2279552930 100644--- a/server/core/helpers/custom-validators/video-studio.ts+++ b/server/core/helpers/custom-validators/video-studio.ts@@ -6,48 +6,54 @@ import { isArray } from './misc.js'import { isVideoFileMimeTypeValid, isVideoImageValid } from './videos.js'import { forceNumber } from '@peertube/peertube-core-utils'-function isValidStudioTasksArray (tasks: any) {+export function isValidStudioTasksArray (tasks: any) {if (!isArray(tasks)) return falsereturn tasks.length >= CONSTRAINTS_FIELDS.VIDEO_STUDIO.TASKS.min &&tasks.length <= CONSTRAINTS_FIELDS.VIDEO_STUDIO.TASKS.max}-function isStudioCutTaskValid (task: VideoStudioTask) {+export function isStudioCutTaskValid (options: {+ task: VideoStudioTask+}) {+ const { task } = options+if (task.name !== 'cut') return falseif (!task.options) return falseconst { start, end } = task.optionsif (!start && !end) return false- if (start && !validator.default.isInt(start + '', CONSTRAINTS_FIELDS.VIDEO_STUDIO.CUT_TIME)) return false- if (end && !validator.default.isInt(end + '', CONSTRAINTS_FIELDS.VIDEO_STUDIO.CUT_TIME)) return false+ if (start && !validator.default.isInt(start + '', CONSTRAINTS_FIELDS.VIDEO_STUDIO.CUT_TIME_START)) return false+ if (end && !validator.default.isInt(end + '', CONSTRAINTS_FIELDS.VIDEO_STUDIO.CUT_TIME_END)) return falseif (!start || !end) return truereturn forceNumber(start) < forceNumber(end)}-function isStudioTaskAddIntroOutroValid (task: VideoStudioTask, indice: number, files: Express.Multer.File[]) {+export function isStudioTaskAddIntroOutroValid (options: {+ task: VideoStudioTask+ indice: number+ files: Express.Multer.File[]+}) {+ const { task, indice, files } = options+const file = files.find(f => f.fieldname === buildTaskFileFieldname(indice, 'file'))return (task.name === 'add-intro' || task.name === 'add-outro') &&file && isVideoFileMimeTypeValid([ file ], null)}-function isStudioTaskAddWatermarkValid (task: VideoStudioTask, indice: number, files: Express.Multer.File[]) {+export function isStudioTaskAddWatermarkValid (options: {+ task: VideoStudioTask+ indice: number+ files: Express.Multer.File[]+}) {+ const { task, indice, files } = options+const file = files.find(f => f.fieldname === buildTaskFileFieldname(indice, 'file'))return task.name === 'add-watermark' &&file && isVideoImageValid([ file ], null, true)}--// -----------------------------------------------------------------------------export {- isValidStudioTasksArray,-- isStudioCutTaskValid,- isStudioTaskAddIntroOutroValid,- isStudioTaskAddWatermarkValid-}diff --git a/server/core/initializers/constants.ts b/server/core/initializers/constants.tsindex 616701080a..d6f974ff56 100644--- a/server/core/initializers/constants.ts+++ b/server/core/initializers/constants.ts@@ -516,7 +516,8 @@ export const CONSTRAINTS_FIELDS = {},VIDEO_STUDIO: {TASKS: { min: 1, max: 10 }, // Number of tasks- CUT_TIME: { min: 0 } // Value+ CUT_TIME_START: { min: 0 }, // Value+ CUT_TIME_END: { min: 1 } // Value},LOGS: {CLIENT_MESSAGE: { min: 1, max: 1000 }, // Lengthdiff --git a/server/core/middlewares/validators/videos/video-studio.ts b/server/core/middlewares/validators/videos/video-studio.tsindex dbf9d23c2d..7daca148a5 100644--- a/server/core/middlewares/validators/videos/video-studio.ts+++ b/server/core/middlewares/validators/videos/video-studio.ts@@ -26,7 +26,7 @@ const videoStudioAddEditionValidator = [if (CONFIG.VIDEO_STUDIO.ENABLED !== true) {res.fail({status: HttpStatusCode.BAD_REQUEST_400,- message: 'Video studio is disabled on this instance'+ message: req.t('Video studio is disabled on this instance')})return cleanUpReqFiles(req)@@ -47,7 +47,7 @@ const videoStudioAddEditionValidator = [if (!checkTask(req, task, i)) {res.fail({status: HttpStatusCode.BAD_REQUEST_400,- message: `Task ${task.name} is invalid`+ message: req.t('Task {taskName} is invalid', { taskName: task.name })})return cleanUpReqFiles(req)@@ -57,7 +57,7 @@ const videoStudioAddEditionValidator = [if (task.name === 'add-intro' || task.name === 'add-outro' || task.name === 'add-watermark') {res.fail({status: HttpStatusCode.BAD_REQUEST_400,- message: `Task ${task.name} is invalid: video does not contain a video stream`+ message: req.t('Task {taskName} is invalid: video does not contain a video stream', { taskName: task.name })})return cleanUpReqFiles(req)@@ -71,7 +71,7 @@ const videoStudioAddEditionValidator = [if (await isAudioFile(filePath)) {res.fail({status: HttpStatusCode.BAD_REQUEST_400,- message: `Task ${task.name} is invalid: input file does not contain a video stream`+ message: req.t('Task {taskName} is invalid: input file does not contain a video stream', { taskName: task.name })})return cleanUpReqFiles(req)@@ -104,7 +104,7 @@ export {// ---------------------------------------------------------------------------const taskCheckers: {- [id in VideoStudioTask['name']]: (task: VideoStudioTask, indice?: number, files?: Express.Multer.File[]) => boolean+ [id in VideoStudioTask['name']]: (options: { task: VideoStudioTask, indice?: number, files?: Express.Multer.File[] }) => boolean} = {'cut': isStudioCutTaskValid,'add-intro': isStudioTaskAddIntroOutroValid,@@ -116,5 +116,5 @@ function checkTask (req: express.Request, task: VideoStudioTask, indice?: numberconst checker = taskCheckers[task.name]if (!checker) return false- return checker(task, indice, req.files as Express.Multer.File[])+ return checker({ task, indice, files: req.files as Express.Multer.File[] })}