From 6fad8e51c47b9d07bea99b777c1f55c10f6d576d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 5 Aug 2020 15:35:58 +0200 Subject: Handle playlist oembed --- server/middlewares/validators/oembed.ts | 65 +++++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 15 deletions(-) (limited to 'server/middlewares/validators') diff --git a/server/middlewares/validators/oembed.ts b/server/middlewares/validators/oembed.ts index ab4dbb4d1..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' 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 { logger } from '../../helpers/logger' -import { areValidationErrors } from './utils' import { WEBSERVER } from '../../initializers/constants' -import { doesVideoExist } from '../../helpers/middlewares' +import { areValidationErrors } from './utils' -const urlShouldStartWith = WEBSERVER.SCHEME + '://' + join(WEBSERVER.HOST, 'videos', 'watch') + '/' -const videoWatchRegex = new RegExp('([^/]+)$') +const startVideoPlaylistsURL = WEBSERVER.SCHEME + '://' + join(WEBSERVER.HOST, 'videos', 'watch', 'playlist') + '/' +const startVideosURL = WEBSERVER.SCHEME + '://' + join(WEBSERVER.HOST, 'videos', 'watch') + '/' + +const watchRegex = new RegExp('([^/]+)$') const isURLOptions = { require_host: true, require_tld: true @@ -33,32 +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 url = req.query.url as string - const startIsOk = url.startsWith(urlShouldStartWith) - const matches = videoWatchRegex.exec(url) + 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() } + ] // --------------------------------------------------------------------------- -- cgit v1.2.3