2 files changed, 14 insertions, 10 deletions

diff --git a/server/controllers/api/runners/jobs-files.ts b/server/controllers/api/runners/jobs-files.ts
index cb4eff570..d28f43701 100644
--- a/server/controllers/api/runners/jobs-files.ts
+++ b/server/controllers/api/runners/jobs-files.ts
@@ -4,12 +4,12 @@ import { proxifyHLS, proxifyWebVideoFile } from '@server/lib/object-storage'
 import { VideoPathManager } from '@server/lib/video-path-manager'
 import { getStudioTaskFilePath } from '@server/lib/video-studio'
 import { apiRateLimiter, asyncMiddleware } from '@server/middlewares'
-import { jobOfRunnerGetValidator } from '@server/middlewares/validators/runners'
+import { jobOfRunnerGetValidatorFactory } from '@server/middlewares/validators/runners'
 import {
   runnerJobGetVideoStudioTaskFileValidator,
   runnerJobGetVideoTranscodingFileValidator
 } from '@server/middlewares/validators/runners/job-files'
-import { VideoStorage } from '@shared/models'
+import { RunnerJobState, VideoStorage } from '@shared/models'
 
 const lTags = loggerTagsFactory('api', 'runner')
 
@@ -17,21 +17,21 @@ const runnerJobFilesRouter = express.Router()
 
 runnerJobFilesRouter.post('/jobs/:jobUUID/files/videos/:videoId/max-quality',
   apiRateLimiter,
-  asyncMiddleware(jobOfRunnerGetValidator),
+  asyncMiddleware(jobOfRunnerGetValidatorFactory([ RunnerJobState.PROCESSING ])),
   asyncMiddleware(runnerJobGetVideoTranscodingFileValidator),
   asyncMiddleware(getMaxQualityVideoFile)
 )
 
 runnerJobFilesRouter.post('/jobs/:jobUUID/files/videos/:videoId/previews/max-quality',
   apiRateLimiter,
-  asyncMiddleware(jobOfRunnerGetValidator),
+  asyncMiddleware(jobOfRunnerGetValidatorFactory([ RunnerJobState.PROCESSING ])),
   asyncMiddleware(runnerJobGetVideoTranscodingFileValidator),
   getMaxQualityVideoPreview
 )
 
 runnerJobFilesRouter.post('/jobs/:jobUUID/files/videos/:videoId/studio/task-files/:filename',
   apiRateLimiter,
-  asyncMiddleware(jobOfRunnerGetValidator),
+  asyncMiddleware(jobOfRunnerGetValidatorFactory([ RunnerJobState.PROCESSING ])),
   asyncMiddleware(runnerJobGetVideoTranscodingFileValidator),
   runnerJobGetVideoStudioTaskFileValidator,
   getVideoStudioTaskFile
diff --git a/server/controllers/api/runners/jobs.ts b/server/controllers/api/runners/jobs.ts
index 5d687e689..be5911b53 100644
--- a/server/controllers/api/runners/jobs.ts
+++ b/server/controllers/api/runners/jobs.ts
@@ -22,7 +22,7 @@ import {
   cancelRunnerJobValidator,
   errorRunnerJobValidator,
   getRunnerFromTokenValidator,
-  jobOfRunnerGetValidator,
+  jobOfRunnerGetValidatorFactory,
   runnerJobGetValidator,
   successRunnerJobValidator,
   updateRunnerJobValidator
@@ -85,7 +85,7 @@ runnerJobsRouter.post('/jobs/:jobUUID/accept',
 
 runnerJobsRouter.post('/jobs/:jobUUID/abort',
   apiRateLimiter,
-  asyncMiddleware(jobOfRunnerGetValidator),
+  asyncMiddleware(jobOfRunnerGetValidatorFactory([ RunnerJobState.PROCESSING ])),
   abortRunnerJobValidator,
   asyncMiddleware(abortRunnerJob)
 )
@@ -93,13 +93,13 @@ runnerJobsRouter.post('/jobs/:jobUUID/abort',
 runnerJobsRouter.post('/jobs/:jobUUID/update',
   runnerJobUpdateVideoFiles,
   apiRateLimiter, // Has to be after multer middleware to parse runner token
-  asyncMiddleware(jobOfRunnerGetValidator),
+  asyncMiddleware(jobOfRunnerGetValidatorFactory([ RunnerJobState.PROCESSING, RunnerJobState.COMPLETING, RunnerJobState.COMPLETED ])),
   updateRunnerJobValidator,
   asyncMiddleware(updateRunnerJobController)
 )
 
 runnerJobsRouter.post('/jobs/:jobUUID/error',
-  asyncMiddleware(jobOfRunnerGetValidator),
+  asyncMiddleware(jobOfRunnerGetValidatorFactory([ RunnerJobState.PROCESSING ])),
   errorRunnerJobValidator,
   asyncMiddleware(errorRunnerJob)
 )
@@ -107,7 +107,7 @@ runnerJobsRouter.post('/jobs/:jobUUID/error',
 runnerJobsRouter.post('/jobs/:jobUUID/success',
   postRunnerJobSuccessVideoFiles,
   apiRateLimiter, // Has to be after multer middleware to parse runner token
-  asyncMiddleware(jobOfRunnerGetValidator),
+  asyncMiddleware(jobOfRunnerGetValidatorFactory([ RunnerJobState.PROCESSING ])),
   successRunnerJobValidator,
   asyncMiddleware(postRunnerJobSuccess)
 )
@@ -272,6 +272,10 @@ async function updateRunnerJobController (req: express.Request, res: express.Res
   const runner = runnerJob.Runner
   const body: RunnerJobUpdateBody = req.body
 
+  if (runnerJob.state === RunnerJobState.COMPLETING || runnerJob.state === RunnerJobState.COMPLETED) {
+    return res.sendStatus(HttpStatusCode.NO_CONTENT_204)
+  }
+
   const payloadBuilder = jobUpdateBuilders[runnerJob.type]
   const updatePayload = payloadBuilder
     ? payloadBuilder(body.payload, req.files as UploadFiles)