From 71e3e879c0616882ee82a0e44f8c2e5ee9698a3e Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 2 Dec 2022 14:47:21 +0100 Subject: Support reinjecting token in private m3u8 playlist --- server/controllers/object-storage-proxy.ts | 20 ++++++++++++++- server/controllers/shared/m3u8-playlist.ts | 14 +++++++++++ server/controllers/static.ts | 39 ++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 server/controllers/shared/m3u8-playlist.ts (limited to 'server/controllers') diff --git a/server/controllers/object-storage-proxy.ts b/server/controllers/object-storage-proxy.ts index 3ce279671..aa853a383 100644 --- a/server/controllers/object-storage-proxy.ts +++ b/server/controllers/object-storage-proxy.ts @@ -1,7 +1,10 @@ import cors from 'cors' import express from 'express' +import { PassThrough, pipeline } from 'stream' import { logger } from '@server/helpers/logger' +import { StreamReplacer } from '@server/helpers/stream-replacer' import { OBJECT_STORAGE_PROXY_PATHS } from '@server/initializers/constants' +import { injectQueryToPlaylistUrls } from '@server/lib/hls' import { getHLSFileReadStream, getWebTorrentFileReadStream } from '@server/lib/object-storage' import { asyncMiddleware, @@ -11,6 +14,7 @@ import { optionalAuthenticate } from '@server/middlewares' import { HttpStatusCode } from '@shared/models' +import { buildReinjectVideoFileTokenQuery, doReinjectVideoFileToken } from './shared/m3u8-playlist' const objectStorageProxyRouter = express.Router() @@ -67,7 +71,20 @@ async function proxifyHLS (req: express.Request, res: express.Response) { rangeHeader: req.header('range') }) - return stream.pipe(res) + const streamReplacer = filename.endsWith('.m3u8') && doReinjectVideoFileToken(req) + ? new StreamReplacer(line => injectQueryToPlaylistUrls(line, buildReinjectVideoFileTokenQuery(req))) + : new PassThrough() + + return pipeline( + stream, + streamReplacer, + res, + err => { + if (!err) return + + handleObjectStorageFailure(res, err) + } + ) } catch (err) { return handleObjectStorageFailure(res, err) } @@ -75,6 +92,7 @@ async function proxifyHLS (req: express.Request, res: express.Response) { function handleObjectStorageFailure (res: express.Response, err: Error) { if (err.name === 'NoSuchKey') { + logger.debug('Could not find key in object storage to proxify private HLS video file.', { err }) return res.sendStatus(HttpStatusCode.NOT_FOUND_404) } diff --git a/server/controllers/shared/m3u8-playlist.ts b/server/controllers/shared/m3u8-playlist.ts new file mode 100644 index 000000000..e2a66efc0 --- /dev/null +++ b/server/controllers/shared/m3u8-playlist.ts @@ -0,0 +1,14 @@ +import express from 'express' + +function doReinjectVideoFileToken (req: express.Request) { + return req.query.videoFileToken && req.query.reinjectVideoFileToken +} + +function buildReinjectVideoFileTokenQuery (req: express.Request) { + return 'videoFileToken=' + req.query.videoFileToken +} + +export { + doReinjectVideoFileToken, + buildReinjectVideoFileTokenQuery +} diff --git a/server/controllers/static.ts b/server/controllers/static.ts index 6ef9154b9..52e48267f 100644 --- a/server/controllers/static.ts +++ b/server/controllers/static.ts @@ -1,5 +1,8 @@ import cors from 'cors' import express from 'express' +import { readFile } from 'fs-extra' +import { join } from 'path' +import { injectQueryToPlaylistUrls } from '@server/lib/hls' import { asyncMiddleware, ensureCanAccessPrivateVideoHLSFiles, @@ -7,8 +10,10 @@ import { handleStaticError, optionalAuthenticate } from '@server/middlewares' +import { HttpStatusCode } from '@shared/models' import { CONFIG } from '../initializers/config' import { DIRECTORIES, STATIC_MAX_AGE, STATIC_PATHS } from '../initializers/constants' +import { buildReinjectVideoFileTokenQuery, doReinjectVideoFileToken } from './shared/m3u8-playlist' const staticRouter = express.Router() @@ -49,6 +54,12 @@ const privateHLSStaticMiddlewares = CONFIG.STATIC_FILES.PRIVATE_FILES_REQUIRE_AU ? [ optionalAuthenticate, asyncMiddleware(ensureCanAccessPrivateVideoHLSFiles) ] : [] +staticRouter.use( + STATIC_PATHS.STREAMING_PLAYLISTS.PRIVATE_HLS + ':videoUUID/:playlistName.m3u8', + ...privateHLSStaticMiddlewares, + asyncMiddleware(servePrivateM3U8) +) + staticRouter.use( STATIC_PATHS.STREAMING_PLAYLISTS.PRIVATE_HLS, ...privateHLSStaticMiddlewares, @@ -74,3 +85,31 @@ staticRouter.use( export { staticRouter } + +// --------------------------------------------------------------------------- + +async function servePrivateM3U8 (req: express.Request, res: express.Response) { + const path = join(DIRECTORIES.HLS_STREAMING_PLAYLIST.PRIVATE, req.params.videoUUID, req.params.playlistName + '.m3u8') + + let playlistContent: string + + try { + playlistContent = await readFile(path, 'utf-8') + } catch (err) { + if (err.message.includes('ENOENT')) { + return res.fail({ + status: HttpStatusCode.NOT_FOUND_404, + message: 'File not found' + }) + } + + throw err + } + + // Inject token in playlist so players that cannot alter the HTTP request can still watch the video + const transformedContent = doReinjectVideoFileToken(req) + ? injectQueryToPlaylistUrls(playlistContent, buildReinjectVideoFileTokenQuery(req)) + : playlistContent + + return res.set('content-type', 'application/vnd.apple.mpegurl').send(transformedContent).end() +} -- cgit v1.2.3