X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Foembed.ts;h=c9f9ea0c0708ed1e8db2d389e85290498fc5b3b5;hb=c6c0fa6cd8fe8f752463d8982c3dbcd448739c4e;hp=0bb908d0b6719363a5f0c4e57279f8f940181b2c;hpb=6dd9de95dfa39bd5c1faed00d1dbd52cd112bae0;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/validators/oembed.ts b/server/middlewares/validators/oembed.ts
index 0bb908d0b..c9f9ea0c0 100644
--- a/server/middlewares/validators/oembed.ts
+++ b/server/middlewares/validators/oembed.ts
@@ -1,15 +1,19 @@
 import * as express from 'express'
-import { query } from 'express-validator/check'
+import { query } from 'express-validator'
 import { join } from 'path'
+import { fetchVideo } from '@server/helpers/video'
+import { VideoPlaylistModel } from '@server/models/video/video-playlist'
+import { VideoPlaylistPrivacy, VideoPrivacy } from '@shared/models'
 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 { areValidationErrors } from './utils'
 import { WEBSERVER } from '../../initializers/constants'
+import { areValidationErrors } from './utils'
+
+const startVideoPlaylistsURL = WEBSERVER.SCHEME + '://' + join(WEBSERVER.HOST, 'videos', 'watch', 'playlist') + '/'
+const startVideosURL = WEBSERVER.SCHEME + '://' + join(WEBSERVER.HOST, 'videos', 'watch') + '/'
 
-const urlShouldStartWith = WEBSERVER.SCHEME + '://' + join(WEBSERVER.HOST, 'videos', 'watch') + '/'
-const videoWatchRegex = new RegExp('([^/]+)$')
+const watchRegex = new RegExp('([^/]+)$')
 const isURLOptions = {
   require_host: true,
   require_tld: true
@@ -33,29 +37,63 @@ const oembedValidator = [
 
     if (req.query.format !== undefined && req.query.format !== 'json') {
       return res.status(501)
-                .json({ error: 'Requested format is not implemented on server.' })
-                .end()
+        .json({ error: 'Requested format is not implemented on server.' })
     }
 
-    const startIsOk = req.query.url.startsWith(urlShouldStartWith)
-    const matches = videoWatchRegex.exec(req.query.url)
+    const url = req.query.url as string
+
+    const isPlaylist = url.startsWith(startVideoPlaylistsURL)
+    const isVideo = isPlaylist ? false : url.startsWith(startVideosURL)
+
+    const startIsOk = isVideo || isPlaylist
+
+    const matches = watchRegex.exec(url)
+
     if (startIsOk === false || matches === null) {
       return res.status(400)
-                .json({ error: 'Invalid url.' })
-                .end()
+        .json({ error: 'Invalid url.' })
     }
 
-    const videoId = matches[1]
-    if (isIdOrUUIDValid(videoId) === false) {
+    const elementId = matches[1]
+    if (isIdOrUUIDValid(elementId) === false) {
       return res.status(400)
-                .json({ error: 'Invalid video id.' })
-                .end()
+        .json({ error: 'Invalid video or playlist id.' })
     }
 
-    if (!await doesVideoExist(videoId, res)) return
+    if (isVideo) {
+      const video = await fetchVideo(elementId, 'all')
+
+      if (!video) {
+        return res.status(404)
+          .json({ error: 'Video not found' })
+      }
+
+      if (video.privacy !== VideoPrivacy.PUBLIC) {
+        return res.status(403)
+          .json({ error: 'Video is not public' })
+      }
 
+      res.locals.videoAll = video
+      return next()
+    }
+
+    // Is playlist
+
+    const videoPlaylist = await VideoPlaylistModel.loadWithAccountAndChannelSummary(elementId, undefined)
+    if (!videoPlaylist) {
+      return res.status(404)
+        .json({ error: 'Video playlist not found' })
+    }
+
+    if (videoPlaylist.privacy !== VideoPlaylistPrivacy.PUBLIC) {
+      return res.status(403)
+        .json({ error: 'Playlist is not public' })
+    }
+
+    res.locals.videoPlaylistSummary = videoPlaylist
     return next()
   }
+
 ]
 
 // ---------------------------------------------------------------------------