Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Check user rights when displaying live info

Chocobozzz61e1675dfdc9
diff --git a/packages/tests/src/api/check-params/live.ts b/packages/tests/src/api/check-params/live.ts
index a40e96970f..359a0b449a 100644
--- a/packages/tests/src/api/check-params/live.ts
+++ b/packages/tests/src/api/check-params/live.ts
@@ -20,6 +20,7 @@ import {
makeUploadRequest,
sendRTMPStream,
setAccessTokensToServers,
+ setDefaultVideoChannel,
stopFfmpeg
} from '@peertube/peertube-server-commands'
import { checkBadSort } from '@tests/shared/checks.js'
@@ -34,7 +35,11 @@ describe('Test video lives API validator', function () {
let channelId: number
let video: VideoCreateResult
+
let videoIdNotLive: number
+ let videoIdPrivateNotLive: number
+ let videoIdPrivateLive: number
+
let command: LiveCommand
const dvrMaxWindow = 50
@@ -46,6 +51,7 @@ describe('Test video lives API validator', function () {
server = await createSingleServer(1)
await setAccessTokensToServers([ server ])
+ await setDefaultVideoChannel([ server ])
await server.config.enableMinimumTranscoding()
await server.config.updateExistingConfig({
@@ -75,6 +81,16 @@ describe('Test video lives API validator', function () {
{
videoIdNotLive = (await server.videos.quickUpload({ name: 'not live' })).id
+ videoIdPrivateNotLive = (await server.videos.quickUpload({ name: 'not live - private', privacy: VideoPrivacy.PRIVATE })).id
+ }
+
+ {
+ videoIdPrivateLive = (await server.live.quickCreate({
+ name: 'private',
+ privacy: VideoPrivacy.PRIVATE,
+ saveReplay: false,
+ permanentLive: false
+ })).video.id
}
command = server.live
@@ -499,6 +515,12 @@ describe('Test video lives API validator', function () {
await command.get({ videoId: videoIdNotLive, expectedStatus: HttpStatusCode.NOT_FOUND_404 })
})
+ it('Should fail with a private live', async function () {
+ await command.get({ videoId: videoIdPrivateLive, token: null, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
+ await command.get({ videoId: videoIdPrivateLive, token: userAccessToken, expectedStatus: HttpStatusCode.FORBIDDEN_403 })
+ await command.get({ videoId: videoIdPrivateLive, token: server.accessToken })
+ })
+
it('Should succeed with the correct params', async function () {
await command.get({ videoId: video.id })
await command.get({ videoId: video.uuid })
@@ -554,6 +576,15 @@ describe('Test video lives API validator', function () {
it('Should fail with a non replay video', async function () {
await command.getReplaySession({ videoId: videoIdNotLive, expectedStatus: HttpStatusCode.NOT_FOUND_404 })
})
+
+ it('Should fail with a private video', async function () {
+ await command.getReplaySession({ videoId: videoIdPrivateNotLive, token: null, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
+ await command.getReplaySession({
+ videoId: videoIdPrivateNotLive,
+ token: userAccessToken,
+ expectedStatus: HttpStatusCode.FORBIDDEN_403
+ })
+ })
})
describe('When updating live information', async function () {
diff --git a/server/core/middlewares/validators/videos/video-live.ts b/server/core/middlewares/validators/videos/video-live.ts
index 4b7418d4ec..83eb02e287 100644
--- a/server/core/middlewares/validators/videos/video-live.ts
+++ b/server/core/middlewares/validators/videos/video-live.ts
@@ -23,10 +23,17 @@ import { isValidPasswordProtectedPrivacy, isVideoNameValid, isVideoReplayPrivacy
import { cleanUpReqFiles } from '../../../helpers/express-utils.js'
import { logger } from '../../../helpers/logger.js'
import { CONFIG } from '../../../initializers/config.js'
-import { areValidationErrors, checkCanManageVideo, doesChannelIdExist, doesVideoExist, isValidVideoIdParam } from '../shared/index.js'
+import {
+ areValidationErrors,
+ checkCanManageVideo,
+ checkCanSeeVideo,
+ doesChannelIdExist,
+ doesVideoExist,
+ isValidVideoIdParam
+} from '../shared/index.js'
import { areErrorsInNSFW, getCommonVideoEditAttributes } from './videos.js'
-export const videoLiveGetValidatorFactory = (loadType: VideoLoadType) => {
+export const videoLiveGetValidatorFactory = (loadType: Extract<VideoLoadType, 'with-rights' | 'full'>) => {
return [
isValidVideoIdParam('videoId'),
@@ -34,10 +41,11 @@ export const videoLiveGetValidatorFactory = (loadType: VideoLoadType) => {
if (areValidationErrors(req, res)) return
if (!await doesVideoExist(req.params.videoId, res, loadType)) return
+ const video = res.locals.videoFull || res.locals.videoWithRights
+ if (!await checkCanSeeVideo({ req, res, video, paramId: req.params.videoId })) return
+
const videoLive = await VideoLiveModel.loadByVideoIdFull(getVideoWithAttributes(res).id)
- if (!videoLive) {
- return res.sendStatus(HttpStatusCode.NOT_FOUND_404)
- }
+ if (!videoLive) return res.sendStatus(HttpStatusCode.NOT_FOUND_404)
res.locals.videoLive = videoLive
@@ -268,15 +276,13 @@ export const videoLiveFindReplaySessionValidator = [
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
if (areValidationErrors(req, res)) return
- if (!await doesVideoExist(req.params.videoId, res, 'id')) return
+ if (!await doesVideoExist(req.params.videoId, res, 'with-rights')) return
- const session = await VideoLiveSessionModel.findSessionOfReplay(res.locals.videoId.id)
- if (!session) {
- return res.fail({
- status: HttpStatusCode.NOT_FOUND_404,
- message: 'No live replay found'
- })
- }
+ const video = res.locals.videoWithRights
+ if (!await checkCanSeeVideo({ req, res, video, paramId: req.params.videoId })) return
+
+ const session = await VideoLiveSessionModel.findSessionOfReplay(video.id)
+ if (!session) return res.fail({ status: HttpStatusCode.NOT_FOUND_404, message: req.t('No live replay found') })
res.locals.videoLiveSession = session