X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Flib%2Fclient-html.ts;h=1d8a08ed0bfc59a891dab5cfa8aea0031baf4284;hb=7738273b808f0ff1494f18c4cc13553505e6ac6d;hp=8841dd2ac2a69f02e88c26eb0caf3760cf49c851;hpb=f847ccb33c7f2b8dd56a280b742b0b3152bf6b34;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts index 8841dd2ac..1d8a08ed0 100644 --- a/server/lib/client-html.ts +++ b/server/lib/client-html.ts @@ -4,7 +4,7 @@ import { CUSTOM_HTML_TAG_COMMENTS, EMBED_SIZE, PLUGIN_GLOBAL_CSS_PATH, WEBSERVER import { join } from 'path' import { escapeHTML, sha256 } from '../helpers/core-utils' import { VideoModel } from '../models/video/video' -import * as validator from 'validator' +import validator from 'validator' import { VideoPrivacy } from '../../shared/models/videos' import { readFile } from 'fs-extra' import { getActivityStreamDuration } from '../models/video/video-format-utils' @@ -13,6 +13,7 @@ import { VideoChannelModel } from '../models/video/video-channel' import * as Bluebird from 'bluebird' import { CONFIG } from '../initializers/config' import { logger } from '../helpers/logger' +import { MAccountActor, MChannelActor, MVideo } from '../typings/models' export class ClientHtml { @@ -25,7 +26,9 @@ export class ClientHtml { } static async getDefaultHTMLPage (req: express.Request, res: express.Response, paramLang?: string) { - const html = await ClientHtml.getIndexHTML(req, res, paramLang) + const html = paramLang + ? await ClientHtml.getIndexHTML(req, res, paramLang) + : await ClientHtml.getIndexHTML(req, res) let customHtml = ClientHtml.addTitleTag(html) customHtml = ClientHtml.addDescriptionTag(customHtml) @@ -36,17 +39,19 @@ export class ClientHtml { static async getWatchHTMLPage (videoId: string, req: express.Request, res: express.Response) { // Let Angular application handle errors if (!validator.isInt(videoId) && !validator.isUUID(videoId, 4)) { + res.status(404) return ClientHtml.getIndexHTML(req, res) } const [ html, video ] = await Promise.all([ ClientHtml.getIndexHTML(req, res), - VideoModel.load(videoId) + VideoModel.loadWithBlacklist(videoId) ]) // Let Angular application handle errors - if (!video || video.privacy === VideoPrivacy.PRIVATE) { - return ClientHtml.getIndexHTML(req, res) + if (!video || video.privacy === VideoPrivacy.PRIVATE || video.privacy === VideoPrivacy.INTERNAL || video.VideoBlacklist) { + res.status(404) + return html } let customHtml = ClientHtml.addTitleTag(html, escapeHTML(video.name)) @@ -65,7 +70,7 @@ export class ClientHtml { } private static async getAccountOrChannelHTMLPage ( - loader: () => Bluebird, + loader: () => Bluebird, req: express.Request, res: express.Response ) { @@ -76,6 +81,7 @@ export class ClientHtml { // Let Angular application handle errors if (!entity) { + res.status(404) return ClientHtml.getIndexHTML(req, res) } @@ -94,6 +100,7 @@ export class ClientHtml { let html = buffer.toString() + if (paramLang) html = ClientHtml.addHtmlLang(html, paramLang) html = ClientHtml.addCustomCSS(html) html = await ClientHtml.addAsyncPluginCSS(html) @@ -102,7 +109,7 @@ export class ClientHtml { return html } - private static getIndexPath (req: express.Request, res: express.Response, paramLang?: string) { + private static getIndexPath (req: express.Request, res: express.Response, paramLang: string) { let lang: string // Check param lang validity @@ -125,6 +132,10 @@ export class ClientHtml { return join(__dirname, '../../../client/dist/' + buildFileLocale(lang) + '/index.html') } + private static addHtmlLang (htmlStringPage: string, paramLang: string) { + return htmlStringPage.replace('', ``) + } + private static addTitleTag (htmlStringPage: string, title?: string) { let text = title || CONFIG.INSTANCE.NAME if (title) text += ` - ${CONFIG.INSTANCE.NAME}` @@ -157,7 +168,7 @@ export class ClientHtml { return htmlStringPage.replace('', linkTag + '') } - private static addVideoOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoModel) { + private static addVideoOpenGraphAndOEmbedTags (htmlStringPage: string, video: MVideo) { const previewUrl = WEBSERVER.URL + video.getPreviewStaticPath() const videoUrl = WEBSERVER.URL + video.getWatchStaticPath() @@ -236,7 +247,7 @@ export class ClientHtml { return this.addOpenGraphAndOEmbedTags(htmlStringPage, tagsString) } - private static addAccountOrChannelMetaTags (htmlStringPage: string, entity: AccountModel | VideoChannelModel) { + private static addAccountOrChannelMetaTags (htmlStringPage: string, entity: MAccountActor | MChannelActor) { // SEO, use origin account or channel URL const metaTags = ``