X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fclient-html.ts;h=4a4b0d12f9799b1d21455a0cafb16e925e625504;hb=3b0bd70aa05ab82fa30fe67ed4899d44652c703a;hp=b2c376e209529de65740dde6003ae768e256a259;hpb=73471b1a52f242e86364ffb077ea6cadb3b07ae2;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts index b2c376e20..4a4b0d12f 100644 --- a/server/lib/client-html.ts +++ b/server/lib/client-html.ts @@ -1,25 +1,34 @@ import * as express from 'express' -import * as Bluebird from 'bluebird' import { buildFileLocale, getDefaultLocale, is18nLocale, POSSIBLE_LOCALES } from '../../shared/models/i18n/i18n' -import { CONFIG, CUSTOM_HTML_TAG_COMMENTS, EMBED_SIZE } from '../initializers' +import { CUSTOM_HTML_TAG_COMMENTS, EMBED_SIZE, PLUGIN_GLOBAL_CSS_PATH, WEBSERVER } from '../initializers/constants' import { join } from 'path' -import { escapeHTML } from '../helpers/core-utils' +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' +import { AccountModel } from '../models/account/account' +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 { private static htmlCache: { [path: string]: string } = {} static invalidCache () { + logger.info('Cleaning HTML cache.') + ClientHtml.htmlCache = {} } 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) @@ -28,28 +37,57 @@ export class ClientHtml { } static async getWatchHTMLPage (videoId: string, req: express.Request, res: express.Response) { - let videoPromise: Bluebird - // Let Angular application handle errors - if (validator.isInt(videoId) || validator.isUUID(videoId, 4)) { - videoPromise = VideoModel.loadAndPopulateAccountAndServerAndTags(videoId) - } else { + 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), - videoPromise + 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)) customHtml = ClientHtml.addDescriptionTag(customHtml, escapeHTML(video.description)) - customHtml = ClientHtml.addOpenGraphAndOEmbedTags(customHtml, video) + customHtml = ClientHtml.addVideoOpenGraphAndOEmbedTags(customHtml, video) + + return customHtml + } + + static async getAccountHTMLPage (nameWithHost: string, req: express.Request, res: express.Response) { + return this.getAccountOrChannelHTMLPage(() => AccountModel.loadByNameWithHost(nameWithHost), req, res) + } + + static async getVideoChannelHTMLPage (nameWithHost: string, req: express.Request, res: express.Response) { + return this.getAccountOrChannelHTMLPage(() => VideoChannelModel.loadByNameWithHostAndPopulateAccount(nameWithHost), req, res) + } + + private static async getAccountOrChannelHTMLPage ( + loader: () => Bluebird, + req: express.Request, + res: express.Response + ) { + const [ html, entity ] = await Promise.all([ + ClientHtml.getIndexHTML(req, res), + loader() + ]) + + // Let Angular application handle errors + if (!entity) { + res.status(404) + return ClientHtml.getIndexHTML(req, res) + } + + let customHtml = ClientHtml.addTitleTag(html, escapeHTML(entity.getDisplayName())) + customHtml = ClientHtml.addDescriptionTag(customHtml, escapeHTML(entity.description)) + customHtml = ClientHtml.addAccountOrChannelMetaTags(customHtml, entity) return customHtml } @@ -62,14 +100,16 @@ export class ClientHtml { let html = buffer.toString() + if (paramLang) html = ClientHtml.addHtmlLang(html, paramLang) html = ClientHtml.addCustomCSS(html) + html = await ClientHtml.addAsyncPluginCSS(html) ClientHtml.htmlCache[path] = html 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 @@ -78,8 +118,8 @@ export class ClientHtml { // Save locale in cookies res.cookie('clientLanguage', lang, { - secure: CONFIG.WEBSERVER.SCHEME === 'https', - sameSite: true, + secure: WEBSERVER.SCHEME === 'https', + sameSite: 'none', maxAge: 1000 * 3600 * 24 * 90 // 3 months }) @@ -92,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}` @@ -109,18 +153,28 @@ export class ClientHtml { } private static addCustomCSS (htmlStringPage: string) { - const styleTag = '' + const styleTag = `` return htmlStringPage.replace(CUSTOM_HTML_TAG_COMMENTS.CUSTOM_CSS, styleTag) } - private static addOpenGraphAndOEmbedTags (htmlStringPage: string, video: VideoModel) { - const previewUrl = CONFIG.WEBSERVER.URL + video.getPreviewStaticPath() - const videoUrl = CONFIG.WEBSERVER.URL + video.getWatchStaticPath() + private static async addAsyncPluginCSS (htmlStringPage: string) { + const globalCSSContent = await readFile(PLUGIN_GLOBAL_CSS_PATH) + if (globalCSSContent.byteLength === 0) return htmlStringPage + + const fileHash = sha256(globalCSSContent) + const linkTag = `` + + return htmlStringPage.replace('', linkTag + '') + } + + private static addVideoOpenGraphAndOEmbedTags (htmlStringPage: string, video: MVideo) { + const previewUrl = WEBSERVER.URL + video.getPreviewStaticPath() + const videoUrl = WEBSERVER.URL + video.getWatchStaticPath() const videoNameEscaped = escapeHTML(video.name) const videoDescriptionEscaped = escapeHTML(video.description) - const embedUrl = CONFIG.WEBSERVER.URL + video.getEmbedStaticPath() + const embedUrl = WEBSERVER.URL + video.getEmbedStaticPath() const openGraphMetaTags = { 'og:type': 'video', @@ -152,7 +206,7 @@ export class ClientHtml { const oembedLinkTags = [ { type: 'application/json+oembed', - href: CONFIG.WEBSERVER.URL + '/services/oembed?url=' + encodeURIComponent(videoUrl), + href: WEBSERVER.URL + '/services/oembed?url=' + encodeURIComponent(videoUrl), title: videoNameEscaped } ] @@ -160,14 +214,14 @@ export class ClientHtml { const schemaTags = { '@context': 'http://schema.org', '@type': 'VideoObject', - name: videoNameEscaped, - description: videoDescriptionEscaped, - thumbnailUrl: previewUrl, - uploadDate: video.createdAt.toISOString(), - duration: getActivityStreamDuration(video.duration), - contentUrl: videoUrl, - embedUrl: embedUrl, - interactionCount: video.views + 'name': videoNameEscaped, + 'description': videoDescriptionEscaped, + 'thumbnailUrl': previewUrl, + 'uploadDate': video.createdAt.toISOString(), + 'duration': getActivityStreamDuration(video.duration), + 'contentUrl': videoUrl, + 'embedUrl': embedUrl, + 'interactionCount': video.views } let tagsString = '' @@ -190,6 +244,17 @@ export class ClientHtml { // SEO, use origin video url so Google does not index remote videos tagsString += `` - return htmlStringPage.replace(CUSTOM_HTML_TAG_COMMENTS.OPENGRAPH_AND_OEMBED, tagsString) + return this.addOpenGraphAndOEmbedTags(htmlStringPage, tagsString) + } + + private static addAccountOrChannelMetaTags (htmlStringPage: string, entity: MAccountActor | MChannelActor) { + // SEO, use origin account or channel URL + const metaTags = `` + + return this.addOpenGraphAndOEmbedTags(htmlStringPage, metaTags) + } + + private static addOpenGraphAndOEmbedTags (htmlStringPage: string, metaTags: string) { + return htmlStringPage.replace(CUSTOM_HTML_TAG_COMMENTS.META_TAGS, metaTags) } }