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

Merge branch 'release/5.1.0' into develop

pull/5684/head
Chocobozzz 2023-03-07 11:17:12 +01:00
parent d9dbf27a7d 73fb3dc535
commit 09f3d81e0c
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/controllers/object-storage-proxy.ts
View File

@ -77,7 +77,7 @@ async function proxifyHLS (req: express.Request, res: express.Response) {
setS3Headers(res, s3Response)
const streamReplacer = filename.endsWith('.m3u8') && doReinjectVideoFileToken(req)
? new StreamReplacer(line => injectQueryToPlaylistUrls(line, buildReinjectVideoFileTokenQuery(req)))
? new StreamReplacer(line => injectQueryToPlaylistUrls(line, buildReinjectVideoFileTokenQuery(req, filename.endsWith('master.m3u8'))))
: new PassThrough()
return pipeline(

8
server/controllers/shared/m3u8-playlist.ts
View File

@ -4,8 +4,12 @@ function doReinjectVideoFileToken (req: express.Request) {
return req.query.videoFileToken && req.query.reinjectVideoFileToken
}
function buildReinjectVideoFileTokenQuery (req: express.Request) {
return 'videoFileToken=' + req.query.videoFileToken
function buildReinjectVideoFileTokenQuery (req: express.Request, isMaster: boolean) {
const query = 'videoFileToken=' + req.query.videoFileToken
if (isMaster) {
return query + '&reinjectVideoFileToken=true'
}
return query
}
export {

3
server/controllers/static.ts
View File

@ -90,6 +90,7 @@ export {
async function servePrivateM3U8 (req: express.Request, res: express.Response) {
const path = join(DIRECTORIES.HLS_STREAMING_PLAYLIST.PRIVATE, req.params.videoUUID, req.params.playlistName + '.m3u8')
const filename = req.params.playlistName + '.m3u8'
let playlistContent: string
@ -108,7 +109,7 @@ async function servePrivateM3U8 (req: express.Request, res: express.Response) {
// 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))
? injectQueryToPlaylistUrls(playlistContent, buildReinjectVideoFileTokenQuery(req, filename.endsWith('master.m3u8')))
: playlistContent
return res.set('content-type', 'application/vnd.apple.mpegurl').send(transformedContent).end()

5
server/tests/api/videos/video-static-file-privacy.ts
View File

@ -256,10 +256,9 @@ describe('Test video static file privacy', function () {
const videoFileToken = await server.videoToken.getVideoFileToken({ videoId: uuid })
await waitJobs([ server ])
const video = await server.videos.getWithToken({ id: uuid })
const hls = video.streamingPlaylists[0]
{
const video = await server.videos.getWithToken({ id: uuid })
const hls = video.streamingPlaylists[0]
const query = { videoFileToken }
const { text } = await makeRawRequest({ url: hls.playlistUrl, query, expectedStatus: HttpStatusCode.OK_200 })

3
server/tests/shared/streaming-playlists.ts
View File

@ -214,7 +214,7 @@ async function checkVideoFileTokenReinjection (options: {
? i
: `-${resolution}`
expect(text).to.contain(`${suffix}.m3u8?videoFileToken=${videoFileToken}`)
expect(text).to.contain(`${suffix}.m3u8?videoFileToken=${videoFileToken}&reinjectVideoFileToken=true`)
}
const resolutionPlaylists = extractResolutionPlaylistUrls(hls.playlistUrl, text)
@ -228,6 +228,7 @@ async function checkVideoFileTokenReinjection (options: {
: '.mp4'
expect(text).to.contain(`${extension}?videoFileToken=${videoFileToken}`)
expect(text).not.to.contain(`reinjectVideoFileToken=true`)
}
}