-import * as express from 'express'
+import express from 'express'
import { body, header, param, query, ValidationChain } from 'express-validator'
+import { isTestInstance } from '@server/helpers/core-utils'
import { getResumableUploadPath } from '@server/helpers/upload'
+import { Redis } from '@server/lib/redis'
import { isAbleToUploadVideo } from '@server/lib/user'
import { getServerActor } from '@server/models/application/application'
import { ExpressPromiseHandler } from '@server/types/express'
import { MUserAccountId, MVideoFullLight } from '@server/types/models'
+import { getAllPrivacies } from '@shared/core-utils'
+import { VideoInclude } from '@shared/models'
import { ServerErrorCode, UserRight, VideoPrivacy } from '../../../../shared'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
+import { HttpStatusCode } from '../../../../shared/models/http/http-error-codes'
import {
exists,
isBooleanValid,
isVideoFileSizeValid,
isVideoFilterValid,
isVideoImage,
+ isVideoIncludeValid,
isVideoLanguageValid,
isVideoLicenceValid,
isVideoNameValid,
}
])
+const videosResumableUploadIdValidator = [
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ const user = res.locals.oauth.token.User
+ const uploadId = req.query.upload_id
+
+ if (uploadId.startsWith(user.id + '-') !== true) {
+ return res.fail({
+ status: HttpStatusCode.FORBIDDEN_403,
+ message: 'You cannot send chunks in another user upload'
+ })
+ }
+
+ return next()
+ }
+]
+
/**
* Gets called after the last PUT request
*/
const videosAddResumableValidator = [
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
const user = res.locals.oauth.token.User
-
const body: express.CustomUploadXFile<express.UploadXFileMetadata> = req.body
- const file = { ...body, duration: undefined, path: getResumableUploadPath(body.id), filename: body.metadata.filename }
-
+ const file = { ...body, duration: undefined, path: getResumableUploadPath(body.name), filename: body.metadata.filename }
const cleanup = () => deleteFileAndCatch(file.path)
+ const uploadId = req.query.upload_id
+ const sessionExists = await Redis.Instance.doesUploadSessionExist(uploadId)
+
+ if (sessionExists) {
+ const sessionResponse = await Redis.Instance.getUploadSession(uploadId)
+
+ if (!sessionResponse) {
+ res.setHeader('Retry-After', 300) // ask to retry after 5 min, knowing the upload_id is kept for up to 15 min after completion
+
+ return res.fail({
+ status: HttpStatusCode.SERVICE_UNAVAILABLE_503,
+ message: 'The upload is already being processed'
+ })
+ }
+
+ if (isTestInstance()) {
+ res.setHeader('x-resumable-upload-cached', 'true')
+ }
+
+ return res.json(sessionResponse)
+ }
+
+ await Redis.Instance.setUploadSession(uploadId)
+
if (!await doesVideoChannelOfAccountExist(file.metadata.channelId, user, res)) return cleanup()
try {
const videoFileMetadata = {
mimetype: req.headers['x-upload-content-type'] as string,
size: +req.headers['x-upload-content-length'],
- originalname: req.body.name
+ originalname: req.body.filename
}
const user = res.locals.oauth.token.User
// multer required unsetting the Content-Type, now we can set it for node-uploadx
req.headers['content-type'] = 'application/json; charset=utf-8'
// place previewfile in metadata so that uploadx saves it in .META
- if (req.files['previewfile']) req.body.previewfile = req.files['previewfile']
+ if (req.files?.['previewfile']) req.body.previewfile = req.files['previewfile']
return next()
}
.optional()
.customSanitizer(toArray)
.custom(isStringArray).withMessage('Should have a valid one of language array'),
+ query('privacyOneOf')
+ .optional()
+ .customSanitizer(toArray)
+ .custom(isNumberArray).withMessage('Should have a valid one of privacy array'),
query('tagsOneOf')
.optional()
.customSanitizer(toArray)
query('filter')
.optional()
.custom(isVideoFilterValid).withMessage('Should have a valid filter attribute'),
+ query('include')
+ .optional()
+ .custom(isVideoIncludeValid).withMessage('Should have a valid include attribute'),
+ query('isLocal')
+ .optional()
+ .customSanitizer(toBooleanOrNull)
+ .custom(isBooleanValid).withMessage('Should have a valid local boolean'),
+ query('hasHLSFiles')
+ .optional()
+ .customSanitizer(toBooleanOrNull)
+ .custom(isBooleanValid).withMessage('Should have a valid has hls boolean'),
+ query('hasWebtorrentFiles')
+ .optional()
+ .customSanitizer(toBooleanOrNull)
+ .custom(isBooleanValid).withMessage('Should have a valid has webtorrent boolean'),
query('skipCount')
.optional()
.customSanitizer(toBooleanOrNull)
if (areValidationErrors(req, res)) return
- const user = res.locals.oauth ? res.locals.oauth.token.User : undefined
- if (
- (req.query.filter === 'all-local' || req.query.filter === 'all') &&
- (!user || user.hasRight(UserRight.SEE_ALL_VIDEOS) === false)
- ) {
- res.fail({
- status: HttpStatusCode.UNAUTHORIZED_401,
- message: 'You are not allowed to see all local videos.'
- })
- return
+ // FIXME: deprecated in 4.0, to remove
+ {
+ if (req.query.filter === 'all-local') {
+ req.query.include = VideoInclude.NOT_PUBLISHED_STATE
+ req.query.isLocal = true
+ req.query.privacyOneOf = getAllPrivacies()
+ } else if (req.query.filter === 'all') {
+ req.query.include = VideoInclude.NOT_PUBLISHED_STATE
+ req.query.privacyOneOf = getAllPrivacies()
+ } else if (req.query.filter === 'local') {
+ req.query.isLocal = true
+ }
+
+ req.query.filter = undefined
+ }
+
+ const user = res.locals.oauth?.token.User
+
+ if ((!user || user.hasRight(UserRight.SEE_ALL_VIDEOS) !== true)) {
+ if (req.query.include || req.query.privacyOneOf) {
+ return res.fail({
+ status: HttpStatusCode.UNAUTHORIZED_401,
+ message: 'You are not allowed to see all videos.'
+ })
+ }
}
return next()
videosAddLegacyValidator,
videosAddResumableValidator,
videosAddResumableInitValidator,
+ videosResumableUploadIdValidator,
videosUpdateValidator,
videosGetValidator,