aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/middlewares
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-12-02 17:54:23 +0100
committerChocobozzz <me@florianbigard.com>2022-12-02 17:54:23 +0100
commitb8598d40f650a31fe09a4a5426dcdc2c5c0d566c (patch)
treeee41176817ef13525aadc4f0b37fc9391364d5c9 /server/middlewares
parent190ac9df7c95cdae5294596764afae7ce78d108d (diff)
parentbd09dfaf8dcb0ca4cd5dac9f13e3117486f3bcce (diff)
downloadPeerTube-b8598d40f650a31fe09a4a5426dcdc2c5c0d566c.tar.gz
PeerTube-b8598d40f650a31fe09a4a5426dcdc2c5c0d566c.tar.zst
PeerTube-b8598d40f650a31fe09a4a5426dcdc2c5c0d566c.zip
Merge branch 'release/5.0.0' into develop
Diffstat (limited to 'server/middlewares')
-rw-r--r--server/middlewares/validators/static.ts11
-rw-r--r--server/middlewares/validators/users.ts2
2 files changed, 10 insertions, 3 deletions
diff --git a/server/middlewares/validators/static.ts b/server/middlewares/validators/static.ts
index 13fde6dd1..d3d307787 100644
--- a/server/middlewares/validators/static.ts
+++ b/server/middlewares/validators/static.ts
@@ -2,7 +2,7 @@ import express from 'express'
2import { query } from 'express-validator' 2import { query } from 'express-validator'
3import LRUCache from 'lru-cache' 3import LRUCache from 'lru-cache'
4import { basename, dirname } from 'path' 4import { basename, dirname } from 'path'
5import { exists, isUUIDValid } from '@server/helpers/custom-validators/misc' 5import { exists, isUUIDValid, toBooleanOrNull } from '@server/helpers/custom-validators/misc'
6import { logger } from '@server/helpers/logger' 6import { logger } from '@server/helpers/logger'
7import { LRU_CACHE } from '@server/initializers/constants' 7import { LRU_CACHE } from '@server/initializers/constants'
8import { VideoModel } from '@server/models/video/video' 8import { VideoModel } from '@server/models/video/video'
@@ -60,7 +60,14 @@ const ensureCanAccessVideoPrivateWebTorrentFiles = [
60] 60]
61 61
62const ensureCanAccessPrivateVideoHLSFiles = [ 62const ensureCanAccessPrivateVideoHLSFiles = [
63 query('videoFileToken').optional().custom(exists), 63 query('videoFileToken')
64 .optional()
65 .custom(exists),
66
67 query('reinjectVideoFileToken')
68 .optional()
69 .customSanitizer(toBooleanOrNull)
70 .isBoolean().withMessage('Should be a valid reinjectVideoFileToken boolean'),
64 71
65 async (req: express.Request, res: express.Response, next: express.NextFunction) => { 72 async (req: express.Request, res: express.Response, next: express.NextFunction) => {
66 if (areValidationErrors(req, res)) return 73 if (areValidationErrors(req, res)) return
diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts
index 50327b6ae..64bd9ca70 100644
--- a/server/middlewares/validators/users.ts
+++ b/server/middlewares/validators/users.ts
@@ -44,7 +44,7 @@ const usersListValidator = [
44 query('blocked') 44 query('blocked')
45 .optional() 45 .optional()
46 .customSanitizer(toBooleanOrNull) 46 .customSanitizer(toBooleanOrNull)
47 .isBoolean().withMessage('Should be a valid blocked boolena'), 47 .isBoolean().withMessage('Should be a valid blocked boolean'),
48 48
49 (req: express.Request, res: express.Response, next: express.NextFunction) => { 49 (req: express.Request, res: express.Response, next: express.NextFunction) => {
50 if (areValidationErrors(req, res)) return 50 if (areValidationErrors(req, res)) return