X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Ffeeds.ts;h=0bfe89e6fb35cf13352b07cae4d27703396af45b;hb=b302c80dc0d9ba8eabef9ef6576efe36afc57584;hp=18469bad3ee12bd8669ab340b4f948a46f13439a;hpb=18490b07650d77d7fe376970b749af5a8c672fd6;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/validators/feeds.ts b/server/middlewares/validators/feeds.ts
index 18469bad3..0bfe89e6f 100644
--- a/server/middlewares/validators/feeds.ts
+++ b/server/middlewares/validators/feeds.ts
@@ -1,21 +1,32 @@
-import * as express from 'express'
+import express from 'express'
 import { param, query } from 'express-validator'
+import { HttpStatusCode } from '../../../shared/models/http/http-error-codes'
 import { isValidRSSFeed } from '../../helpers/custom-validators/feeds'
-import { exists, isIdOrUUIDValid, isIdValid } from '../../helpers/custom-validators/misc'
-import { logger } from '../../helpers/logger'
+import { exists, isIdOrUUIDValid, isIdValid, toCompleteUUID } from '../../helpers/custom-validators/misc'
 import {
+  areValidationErrors,
+  checkCanSeeVideo,
   doesAccountIdExist,
   doesAccountNameWithHostExist,
   doesUserFeedTokenCorrespond,
   doesVideoChannelIdExist,
-  doesVideoChannelNameWithHostExist
-} from '../../helpers/middlewares'
-import { doesVideoExist } from '../../helpers/middlewares/videos'
-import { areValidationErrors } from './utils'
+  doesVideoChannelNameWithHostExist,
+  doesVideoExist
+} from './shared'
 
 const feedsFormatValidator = [
-  param('format').optional().custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)'),
-  query('format').optional().custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)')
+  param('format')
+    .optional()
+    .custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)'),
+  query('format')
+    .optional()
+    .custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)'),
+
+  (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    if (areValidationErrors(req, res)) return
+
+    return next()
+  }
 ]
 
 function setFeedFormatContentType (req: express.Request, res: express.Response, next: express.NextFunction) {
@@ -35,10 +46,10 @@ function setFeedFormatContentType (req: express.Request, res: express.Response,
   if (req.accepts(acceptableContentTypes)) {
     res.set('Content-Type', req.accepts(acceptableContentTypes) as string)
   } else {
-    return res.status(406)
-              .json({
-                message: `You should accept at least one of the following content-types: ${acceptableContentTypes.join(', ')}`
-              })
+    return res.fail({
+      status: HttpStatusCode.NOT_ACCEPTABLE_406,
+      message: `You should accept at least one of the following content-types: ${acceptableContentTypes.join(', ')}`
+    })
   }
 
   return next()
@@ -47,23 +58,19 @@ function setFeedFormatContentType (req: express.Request, res: express.Response,
 const videoFeedsValidator = [
   query('accountId')
     .optional()
-    .custom(isIdValid)
-    .withMessage('Should have a valid account id'),
+    .custom(isIdValid),
 
   query('accountName')
     .optional(),
 
   query('videoChannelId')
     .optional()
-    .custom(isIdValid)
-    .withMessage('Should have a valid channel id'),
+    .custom(isIdValid),
 
   query('videoChannelName')
     .optional(),
 
   async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking feeds parameters', { parameters: req.query })
-
     if (areValidationErrors(req, res)) return
 
     if (req.query.accountId && !await doesAccountIdExist(req.query.accountId, res)) return
@@ -77,16 +84,12 @@ const videoFeedsValidator = [
 
 const videoSubscriptionFeedsValidator = [
   query('accountId')
-    .custom(isIdValid)
-    .withMessage('Should have a valid account id'),
+    .custom(isIdValid),
 
   query('token')
-    .custom(exists)
-    .withMessage('Should have a token'),
+    .custom(exists),
 
   async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking subscription feeds parameters', { parameters: req.query })
-
     if (areValidationErrors(req, res)) return
 
     if (!await doesAccountIdExist(req.query.accountId, res)) return
@@ -97,21 +100,22 @@ const videoSubscriptionFeedsValidator = [
 ]
 
 const videoCommentsFeedsValidator = [
-  query('videoId').optional().custom(isIdOrUUIDValid),
+  query('videoId')
+    .optional()
+    .customSanitizer(toCompleteUUID)
+    .custom(isIdOrUUIDValid),
 
   async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking feeds parameters', { parameters: req.query })
-
     if (areValidationErrors(req, res)) return
 
     if (req.query.videoId && (req.query.videoChannelId || req.query.videoChannelName)) {
-      return res.status(400)
-                .json({
-                  message: 'videoId cannot be mixed with a channel filter'
-                })
+      return res.fail({ message: 'videoId cannot be mixed with a channel filter' })
     }
 
-    if (req.query.videoId && !await doesVideoExist(req.query.videoId, res)) return
+    if (req.query.videoId) {
+      if (!await doesVideoExist(req.query.videoId, res)) return
+      if (!await checkCanSeeVideo({ req, res, paramId: req.query.videoId, video: res.locals.videoAll })) return
+    }
 
     return next()
   }