forks/peertube
1
0
Fork 0
Code Releases Activity

Fix 400 error on resumable re-upload

Browse source
This commit is contained in:
Chocobozzz 2023-06-29 11:35:25 +02:00
parent 926c3f2b37
commit 6bd160a68d
No known key found for this signature in database
GPG key ID: 583A612D890159BE
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
server/controllers/api/index.ts
View file

@ -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()
}

4
server/controllers/api/videos/upload.ts
View file

@ -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',

8
server/helpers/express-utils.ts
View file

@ -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