X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fpagination.ts;h=79ddbbf184d42c0c36be7c538a36f7ae3dc7f44a;hb=e364e31e25bd1d4b8d801c845a96d6be708f0a18;hp=a5a542cdfe0f3fcf4ace19f879fbd6403750d406;hpb=b60e5f38daf77e720a27aa86d3b482c58906a03a;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/validators/pagination.ts b/server/middlewares/validators/pagination.ts
index a5a542cdf..79ddbbf18 100644
--- a/server/middlewares/validators/pagination.ts
+++ b/server/middlewares/validators/pagination.ts
@@ -1,22 +1,30 @@
-import { query } from 'express-validator/check'
-import * as express from 'express'
+import express from 'express'
+import { query } from 'express-validator'
+import { PAGINATION } from '@server/initializers/constants'
+import { areValidationErrors } from './shared'
 
-import { checkErrors } from './utils'
-import { logger } from '../../helpers'
+const paginationValidator = paginationValidatorBuilder()
 
-const paginationValidator = [
-  query('start').optional().isInt().withMessage('Should have a number start'),
-  query('count').optional().isInt().withMessage('Should have a number count'),
+function paginationValidatorBuilder (tags: string[] = []) {
+  return [
+    query('start')
+      .optional()
+      .isInt({ min: 0 }),
+    query('count')
+      .optional()
+      .isInt({ min: 0, max: PAGINATION.GLOBAL.COUNT.MAX }).withMessage(`Should have a number count (max: ${PAGINATION.GLOBAL.COUNT.MAX})`),
 
-  (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking pagination parameters', { parameters: req.query })
+    (req: express.Request, res: express.Response, next: express.NextFunction) => {
+      if (areValidationErrors(req, res, { tags })) return
 
-    checkErrors(req, res, next)
-  }
-]
+      return next()
+    }
+  ]
+}
 
 // ---------------------------------------------------------------------------
 
 export {
-  paginationValidator
+  paginationValidator,
+  paginationValidatorBuilder
 }