From 6bd160a68dac55f61b28c7631f9985320daf7755 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 29 Jun 2023 11:35:25 +0200
Subject: [PATCH] Fix 400 error on resumable re-upload

---
 server/controllers/api/index.ts         | 11 +++++++++--
 server/controllers/api/videos/upload.ts |  4 ++--
 server/helpers/express-utils.ts         |  8 --------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/server/controllers/api/index.ts b/server/controllers/api/index.ts
index 31f1a56f9..38bd135d0 100644
--- a/server/controllers/api/index.ts
+++ b/server/controllers/api/index.ts
@@ -1,8 +1,7 @@
 import cors from 'cors'
 import express from 'express'
-
+import { logger } from '@server/helpers/logger'
 import { HttpStatusCode } from '../../../shared/models'
-import { badRequest } from '../../helpers/express-utils'
 import { abuseRouter } from './abuse'
 import { accountsRouter } from './accounts'
 import { blocklistRouter } from './blocklist'
@@ -64,3 +63,11 @@ export { apiRouter }
 function pong (req: express.Request, res: express.Response) {
   return res.send('pong').status(HttpStatusCode.OK_200).end()
 }
+
+function badRequest (req: express.Request, res: express.Response) {
+  logger.debug(`API express handler not found: bad PeerTube request for ${req.method} - ${req.originalUrl}`)
+
+  return res.type('json')
+    .status(HttpStatusCode.BAD_REQUEST_400)
+    .end()
+}
diff --git a/server/controllers/api/videos/upload.ts b/server/controllers/api/videos/upload.ts
index 0e07302d2..27fef0b1a 100644
--- a/server/controllers/api/videos/upload.ts
+++ b/server/controllers/api/videos/upload.ts
@@ -63,13 +63,13 @@ uploadRouter.post('/upload-resumable',
   authenticate,
   reqVideoFileAddResumable,
   asyncMiddleware(videosAddResumableInitValidator),
-  uploadx.upload
+  (req, res) => uploadx.upload(req, res) // Prevent next() call, explicitely tell to uploadx it's the end
 )
 
 uploadRouter.delete('/upload-resumable',
   authenticate,
   asyncMiddleware(deleteUploadResumableCache),
-  uploadx.upload
+  (req, res) => uploadx.upload(req, res) // Prevent next() call, explicitely tell to uploadx it's the end
 )
 
 uploadRouter.put('/upload-resumable',
diff --git a/server/helpers/express-utils.ts b/server/helpers/express-utils.ts
index 82dd4c178..783097e55 100644
--- a/server/helpers/express-utils.ts
+++ b/server/helpers/express-utils.ts
@@ -1,7 +1,6 @@
 import express, { RequestHandler } from 'express'
 import multer, { diskStorage } from 'multer'
 import { getLowercaseExtension } from '@shared/core-utils'
-import { HttpStatusCode } from '../../shared/models/http/http-error-codes'
 import { CONFIG } from '../initializers/config'
 import { REMOTE_SCHEME } from '../initializers/constants'
 import { isArray } from './custom-validators/misc'
@@ -59,12 +58,6 @@ function getHostWithPort (host: string) {
   return host
 }
 
-function badRequest (_req: express.Request, res: express.Response) {
-  return res.type('json')
-            .status(HttpStatusCode.BAD_REQUEST_400)
-            .end()
-}
-
 function createReqFiles (
   fieldNames: string[],
   mimeTypes: { [id: string]: string | string[] },
@@ -126,7 +119,6 @@ export {
   getHostWithPort,
   createAnyReqFiles,
   isUserAbleToSearchRemoteURI,
-  badRequest,
   createReqFiles,
   cleanUpReqFiles,
   getCountVideos