X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Foembed.ts;h=c89bc26de8ae24ce2275971bdefee5bbd33f33ac;hb=5b9c965d5aa747f29b081289f930ee215fdc23c8;hp=f8e34d2d429f846cf6bd44b3934620b028e9c208;hpb=72c7248b6fdcdb2175e726ff51b42e7555f2bd84;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/validators/oembed.ts b/server/middlewares/validators/oembed.ts
index f8e34d2d4..c89bc26de 100644
--- a/server/middlewares/validators/oembed.ts
+++ b/server/middlewares/validators/oembed.ts
@@ -1,15 +1,12 @@
-import { query } from 'express-validator/check'
 import * as express from 'express'
+import { query } from 'express-validator/check'
 import { join } from 'path'
-
-import { checkErrors } from './utils'
+import { isTestInstance } from '../../helpers/core-utils'
+import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
+import { doesVideoExist } from '../../helpers/custom-validators/videos'
+import { logger } from '../../helpers/logger'
 import { CONFIG } from '../../initializers'
-import {
-  logger,
-  isTestInstance,
-  checkVideoExists,
-  isIdOrUUIDValid
-} from '../../helpers'
+import { areValidationErrors } from './utils'
 
 const urlShouldStartWith = CONFIG.WEBSERVER.SCHEME + '://' + join(CONFIG.WEBSERVER.HOST, 'videos', 'watch') + '/'
 const videoWatchRegex = new RegExp('([^/]+)$')
@@ -29,33 +26,35 @@ const oembedValidator = [
   query('maxheight').optional().isInt().withMessage('Should have a valid max height'),
   query('format').optional().isIn([ 'xml', 'json' ]).withMessage('Should have a valid format'),
 
-  (req: express.Request, res: express.Response, next: express.NextFunction) => {
+  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
     logger.debug('Checking oembed parameters', { parameters: req.query })
 
-    checkErrors(req, res, () => {
-      if (req.query.format !== undefined && req.query.format !== 'json') {
-        return res.status(501)
-                  .json({ error: 'Requested format is not implemented on server.' })
-                  .end()
-      }
+    if (areValidationErrors(req, res)) return
+
+    if (req.query.format !== undefined && req.query.format !== 'json') {
+      return res.status(501)
+                .json({ error: 'Requested format is not implemented on server.' })
+                .end()
+    }
+
+    const startIsOk = req.query.url.startsWith(urlShouldStartWith)
+    const matches = videoWatchRegex.exec(req.query.url)
+    if (startIsOk === false || matches === null) {
+      return res.status(400)
+                .json({ error: 'Invalid url.' })
+                .end()
+    }
 
-      const startIsOk = req.query.url.startsWith(urlShouldStartWith)
-      const matches = videoWatchRegex.exec(req.query.url)
-      if (startIsOk === false || matches === null) {
-        return res.status(400)
-                  .json({ error: 'Invalid url.' })
-                  .end()
-      }
+    const videoId = matches[1]
+    if (isIdOrUUIDValid(videoId) === false) {
+      return res.status(400)
+                .json({ error: 'Invalid video id.' })
+                .end()
+    }
 
-      const videoId = matches[1]
-      if (isIdOrUUIDValid(videoId) === false) {
-        return res.status(400)
-                  .json({ error: 'Invalid video id.' })
-                  .end()
-      }
+    if (!await doesVideoExist(videoId, res)) return
 
-      checkVideoExists(videoId, res, next)
-    })
+    return next()
   }
 ]