X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fclient.ts;h=86ac5fbbc30dd0f44427c5b93698a32e7e0ebcf9;hb=64553e8809271df1113e9143426a27f234410a74;hp=39a198b59bf9cd1896af1f2660d416d74648ec49;hpb=9054a8b6e522dd8d46260dca85e9de94a2d806cf;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/client.ts b/server/controllers/client.ts index 39a198b59..86ac5fbbc 100644 --- a/server/controllers/client.ts +++ b/server/controllers/client.ts @@ -1,37 +1,46 @@ -import * as express from 'express' +import express from 'express' import { constants, promises as fs } from 'fs' +import { readFile } from 'fs-extra' import { join } from 'path' +import { logger } from '@server/helpers/logger' import { CONFIG } from '@server/initializers/config' +import { Hooks } from '@server/lib/plugins/hooks' import { buildFileLocale, getCompleteLocale, is18nLocale, LOCALE_FILES } from '@shared/core-utils/i18n' +import { HttpStatusCode } from '@shared/models' import { root } from '../helpers/core-utils' -import { logger } from '../helpers/logger' -import { ACCEPT_HEADERS, STATIC_MAX_AGE } from '../initializers/constants' -import { ClientHtml } from '../lib/client-html' -import { asyncMiddleware, embedCSP } from '../middlewares' +import { STATIC_MAX_AGE } from '../initializers/constants' +import { ClientHtml, sendHTML, serveIndexHTML } from '../lib/client-html' +import { asyncMiddleware, disableRobots, embedCSP } from '../middlewares' const clientsRouter = express.Router() const distPath = join(root(), 'client', 'dist') -const embedPath = join(distPath, 'standalone', 'videos', 'embed.html') const testEmbedPath = join(distPath, 'standalone', 'videos', 'test-embed.html') // Special route that add OpenGraph and oEmbed tags // Do not use a template engine for a so little thing -clientsRouter.use('/videos/watch/playlist/:id', asyncMiddleware(generateWatchPlaylistHtmlPage)) -clientsRouter.use('/videos/watch/:id', asyncMiddleware(generateWatchHtmlPage)) -clientsRouter.use('/accounts/:nameWithHost', asyncMiddleware(generateAccountHtmlPage)) -clientsRouter.use('/video-channels/:nameWithHost', asyncMiddleware(generateVideoChannelHtmlPage)) +clientsRouter.use([ '/w/p/:id', '/videos/watch/playlist/:id' ], asyncMiddleware(generateWatchPlaylistHtmlPage)) +clientsRouter.use([ '/w/:id', '/videos/watch/:id' ], asyncMiddleware(generateWatchHtmlPage)) +clientsRouter.use([ '/accounts/:nameWithHost', '/a/:nameWithHost' ], asyncMiddleware(generateAccountHtmlPage)) +clientsRouter.use([ '/video-channels/:nameWithHost', '/c/:nameWithHost' ], asyncMiddleware(generateVideoChannelHtmlPage)) +clientsRouter.use('/@:nameWithHost', asyncMiddleware(generateActorHtmlPage)) const embedMiddlewares = [ CONFIG.CSP.ENABLED ? embedCSP : (req: express.Request, res: express.Response, next: express.NextFunction) => next(), - (req: express.Request, res: express.Response) => { + // Set headers + (req: express.Request, res: express.Response, next: express.NextFunction) => { res.removeHeader('X-Frame-Options') + // Don't cache HTML file since it's an index to the immutable JS/CSS files - res.sendFile(embedPath, { maxAge: 0 }) - } + res.setHeader('Cache-Control', 'public, max-age=0') + + next() + }, + + asyncMiddleware(generateEmbedHtmlPage) ] clientsRouter.use('/videos/embed', ...embedMiddlewares) @@ -42,24 +51,11 @@ const testEmbedController = (req: express.Request, res: express.Response) => res clientsRouter.use('/videos/test-embed', testEmbedController) clientsRouter.use('/video-playlists/test-embed', testEmbedController) -// Static HTML/CSS/JS client files -const staticClientFiles = [ - 'ngsw-worker.js', - 'ngsw.json' -] - -for (const staticClientFile of staticClientFiles) { - const path = join(root(), 'client', 'dist', staticClientFile) - - clientsRouter.get(`/${staticClientFile}`, (req: express.Request, res: express.Response) => { - res.sendFile(path, { maxAge: STATIC_MAX_AGE.SERVER }) - }) -} - // Dynamic PWA manifest clientsRouter.get('/manifest.webmanifest', asyncMiddleware(generateManifest)) // Static client overrides +// Must be consistent with static client overrides redirections in /support/nginx/peertube const staticClientOverrides = [ 'assets/images/logo.svg', 'assets/images/favicon.png', @@ -69,7 +65,10 @@ const staticClientOverrides = [ 'assets/images/icons/icon-96x96.png', 'assets/images/icons/icon-144x144.png', 'assets/images/icons/icon-192x192.png', - 'assets/images/icons/icon-512x512.png' + 'assets/images/icons/icon-512x512.png', + 'assets/images/default-playlist.jpg', + 'assets/images/default-avatar-account.png', + 'assets/images/default-avatar-video-channel.png' ] for (const staticClientOverride of staticClientOverrides) { @@ -82,9 +81,15 @@ clientsRouter.use('/client', express.static(distPath, { maxAge: STATIC_MAX_AGE.C // 404 for static files not found clientsRouter.use('/client/*', (req: express.Request, res: express.Response) => { - res.sendStatus(404) + res.status(HttpStatusCode.NOT_FOUND_404).end() }) +// No index exceptions +clientsRouter.all('/about/peertube', + disableRobots, + asyncMiddleware(serveIndexHTML) +) + // Always serve index client page (the client is a single page application, let it handle routing) // Try to provide the right language index.html clientsRouter.use('/(:language)?', asyncMiddleware(serveIndexHTML)) @@ -109,24 +114,29 @@ function serveServerTranslations (req: express.Request, res: express.Response) { return res.sendFile(path, { maxAge: STATIC_MAX_AGE.SERVER }) } - return res.sendStatus(404) + return res.status(HttpStatusCode.NOT_FOUND_404).end() } -async function serveIndexHTML (req: express.Request, res: express.Response) { - if (req.accepts(ACCEPT_HEADERS) === 'html') { - try { - await generateHTMLPage(req, res, req.params.language) - return - } catch (err) { - logger.error('Cannot generate HTML page.', err) - } - } +async function generateEmbedHtmlPage (req: express.Request, res: express.Response) { + const hookName = req.originalUrl.startsWith('/video-playlists/') + ? 'filter:html.embed.video-playlist.allowed.result' + : 'filter:html.embed.video.allowed.result' - return res.status(404).end() -} + const allowParameters = { req } + + const allowedResult = await Hooks.wrapFun( + isEmbedAllowed, + allowParameters, + hookName + ) + + if (!allowedResult || allowedResult.allowed !== true) { + logger.info('Embed is not allowed.', { allowedResult }) -async function generateHTMLPage (req: express.Request, res: express.Response, paramLang?: string) { - const html = await ClientHtml.getDefaultHTMLPage(req, res, paramLang) + return sendHTML(allowedResult?.html || '', res) + } + + const html = await ClientHtml.getEmbedHTML() return sendHTML(html, res) } @@ -155,15 +165,15 @@ async function generateVideoChannelHtmlPage (req: express.Request, res: express. return sendHTML(html, res) } -function sendHTML (html: string, res: express.Response) { - res.set('Content-Type', 'text/html; charset=UTF-8') +async function generateActorHtmlPage (req: express.Request, res: express.Response) { + const html = await ClientHtml.getActorHTMLPage(req.params.nameWithHost, req, res) - return res.send(html) + return sendHTML(html, res) } async function generateManifest (req: express.Request, res: express.Response) { const manifestPhysicalPath = join(root(), 'client', 'dist', 'manifest.webmanifest') - const manifestJson = await fs.readFile(manifestPhysicalPath, 'utf8') + const manifestJson = await readFile(manifestPhysicalPath, 'utf8') const manifest = JSON.parse(manifestJson) manifest.name = CONFIG.INSTANCE.NAME @@ -185,3 +195,10 @@ function serveClientOverride (path: string) { } } } + +type AllowedResult = { allowed: boolean, html?: string } +function isEmbedAllowed (_object: { + req: express.Request +}): AllowedResult { + return { allowed: true } +}