aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/middlewares
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-01-10 16:07:21 +0100
committerChocobozzz <me@florianbigard.com>2022-01-10 16:15:09 +0100
commit84c8d9866890f479faf0168c29be5eb7816ccc8e (patch)
tree573184b0aeed9a81f6381fdeaf59f3f1c52da83d /server/middlewares
parent795212f7acc690c88c86d0fab8772f6564d59cb8 (diff)
downloadPeerTube-84c8d9866890f479faf0168c29be5eb7816ccc8e.tar.gz
PeerTube-84c8d9866890f479faf0168c29be5eb7816ccc8e.tar.zst
PeerTube-84c8d9866890f479faf0168c29be5eb7816ccc8e.zip
Don't display comments of private/internal videosrelease/4.0.0
Diffstat (limited to 'server/middlewares')
-rw-r--r--server/middlewares/validators/videos/video-comments.ts23
1 files changed, 22 insertions, 1 deletions
diff --git a/server/middlewares/validators/videos/video-comments.ts b/server/middlewares/validators/videos/video-comments.ts
index 3ea8bdcbb..04e7b6973 100644
--- a/server/middlewares/validators/videos/video-comments.ts
+++ b/server/middlewares/validators/videos/video-comments.ts
@@ -9,7 +9,14 @@ import { logger } from '../../../helpers/logger'
9import { AcceptResult, isLocalVideoCommentReplyAccepted, isLocalVideoThreadAccepted } from '../../../lib/moderation' 9import { AcceptResult, isLocalVideoCommentReplyAccepted, isLocalVideoThreadAccepted } from '../../../lib/moderation'
10import { Hooks } from '../../../lib/plugins/hooks' 10import { Hooks } from '../../../lib/plugins/hooks'
11import { MCommentOwnerVideoReply, MVideo, MVideoFullLight } from '../../../types/models/video' 11import { MCommentOwnerVideoReply, MVideo, MVideoFullLight } from '../../../types/models/video'
12import { areValidationErrors, doesVideoCommentExist, doesVideoCommentThreadExist, doesVideoExist, isValidVideoIdParam } from '../shared' 12import {
13 areValidationErrors,
14 checkCanSeeVideoIfPrivate,
15 doesVideoCommentExist,
16 doesVideoCommentThreadExist,
17 doesVideoExist,
18 isValidVideoIdParam
19} from '../shared'
13 20
14const listVideoCommentsValidator = [ 21const listVideoCommentsValidator = [
15 query('isLocal') 22 query('isLocal')
@@ -48,6 +55,13 @@ const listVideoCommentThreadsValidator = [
48 if (areValidationErrors(req, res)) return 55 if (areValidationErrors(req, res)) return
49 if (!await doesVideoExist(req.params.videoId, res, 'only-video')) return 56 if (!await doesVideoExist(req.params.videoId, res, 'only-video')) return
50 57
58 if (!await checkCanSeeVideoIfPrivate(req, res, res.locals.onlyVideo)) {
59 return res.fail({
60 status: HttpStatusCode.FORBIDDEN_403,
61 message: 'Cannot list comments of private/internal/blocklisted video'
62 })
63 }
64
51 return next() 65 return next()
52 } 66 }
53] 67]
@@ -65,6 +79,13 @@ const listVideoThreadCommentsValidator = [
65 if (!await doesVideoExist(req.params.videoId, res, 'only-video')) return 79 if (!await doesVideoExist(req.params.videoId, res, 'only-video')) return
66 if (!await doesVideoCommentThreadExist(req.params.threadId, res.locals.onlyVideo, res)) return 80 if (!await doesVideoCommentThreadExist(req.params.threadId, res.locals.onlyVideo, res)) return
67 81
82 if (!await checkCanSeeVideoIfPrivate(req, res, res.locals.onlyVideo)) {
83 return res.fail({
84 status: HttpStatusCode.FORBIDDEN_403,
85 message: 'Cannot list threads of private/internal/blocklisted video'
86 })
87 }
88
68 return next() 89 return next()
69 } 90 }
70] 91]