OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Server: don't be rude when serving unknown video in watch html file

pull/24/head
Chocobozzz 2016-11-14 22:56:40 +01:00
parent 2550fab35e
commit 73ce7f9676
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/controllers/client.js
View File

@ -5,11 +5,9 @@ const express = require('express')
const fs = require('fs') const fs = require('fs')
const mongoose = require('mongoose') const mongoose = require('mongoose')
const path = require('path') const path = require('path')
const validator = require('express-validator').validator
const constants = require('../initializers/constants') const constants = require('../initializers/constants')
const middlewares = require('../middlewares')
const validators = middlewares.validators
const validatorsVideos = validators.videos
const Video = mongoose.model('Video') const Video = mongoose.model('Video')
const router = express.Router() const router = express.Router()
@ -20,7 +18,7 @@ const indexPath = path.join(__dirname, '../../client/dist/index.html')
// Special route that add OpenGraph tags // Special route that add OpenGraph tags
// Do not use a template engine for a so little thing // Do not use a template engine for a so little thing
router.use('/videos/watch/:id', validatorsVideos.videosGet, generateWatchHtmlPage) router.use('/videos/watch/:id', generateWatchHtmlPage)
router.use('/videos/embed', function (req, res, next) { router.use('/videos/embed', function (req, res, next) {
res.sendFile(embedPath) res.sendFile(embedPath)
@ -76,13 +74,18 @@ function addOpenGraphTags (htmlStringPage, video) {
} }
function generateWatchHtmlPage (req, res, next) { function generateWatchHtmlPage (req, res, next) {
const videoId = req.params.id
// Let Angular application handle errors
if (!validator.isMongoId(videoId)) return res.sendFile(indexPath)
parallel({ parallel({
file: function (callback) { file: function (callback) {
fs.readFile(indexPath, callback) fs.readFile(indexPath, callback)
}, },
video: function (callback) { video: function (callback) {
Video.load(req.params.id, callback) Video.load(videoId, callback)
} }
}, function (err, results) { }, function (err, results) {
if (err) return next(err) if (err) return next(err)
@ -90,6 +93,9 @@ function generateWatchHtmlPage (req, res, next) {
const html = results.file.toString() const html = results.file.toString()
const video = results.video const video = results.video
// Let Angular application handle errors
if (!video) return res.sendFile(indexPath)
const htmlStringPageWithTags = addOpenGraphTags(html, video) const htmlStringPageWithTags = addOpenGraphTags(html, video)
res.set('Content-Type', 'text/html; charset=UTF-8').send(htmlStringPageWithTags) res.set('Content-Type', 'text/html; charset=UTF-8').send(htmlStringPageWithTags)
}) })