aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/middlewares/validators/abuse.ts
diff options
context:
space:
mode:
Diffstat (limited to 'server/middlewares/validators/abuse.ts')
-rw-r--r--server/middlewares/validators/abuse.ts74
1 files changed, 49 insertions, 25 deletions
diff --git a/server/middlewares/validators/abuse.ts b/server/middlewares/validators/abuse.ts
index f098e2ff9..048dbead0 100644
--- a/server/middlewares/validators/abuse.ts
+++ b/server/middlewares/validators/abuse.ts
@@ -1,6 +1,7 @@
1import * as express from 'express' 1import * as express from 'express'
2import { body, param, query } from 'express-validator' 2import { body, param, query } from 'express-validator'
3import { 3import {
4 isAbuseFilterValid,
4 isAbuseModerationCommentValid, 5 isAbuseModerationCommentValid,
5 isAbusePredefinedReasonsValid, 6 isAbusePredefinedReasonsValid,
6 isAbusePredefinedReasonValid, 7 isAbusePredefinedReasonValid,
@@ -11,29 +12,28 @@ import {
11 isAbuseVideoIsValid 12 isAbuseVideoIsValid
12} from '@server/helpers/custom-validators/abuses' 13} from '@server/helpers/custom-validators/abuses'
13import { exists, isIdOrUUIDValid, isIdValid, toIntOrNull } from '@server/helpers/custom-validators/misc' 14import { exists, isIdOrUUIDValid, isIdValid, toIntOrNull } from '@server/helpers/custom-validators/misc'
15import { doesCommentIdExist } from '@server/helpers/custom-validators/video-comments'
14import { logger } from '@server/helpers/logger' 16import { logger } from '@server/helpers/logger'
15import { doesAbuseExist, doesVideoAbuseExist, doesVideoExist } from '@server/helpers/middlewares' 17import { doesAbuseExist, doesAccountIdExist, doesVideoAbuseExist, doesVideoExist } from '@server/helpers/middlewares'
18import { AbuseCreate } from '@shared/models'
16import { areValidationErrors } from './utils' 19import { areValidationErrors } from './utils'
17 20
18const abuseReportValidator = [ 21const abuseReportValidator = [
19 param('videoId') 22 body('account.id')
23 .optional()
24 .custom(isIdValid)
25 .withMessage('Should have a valid accountId'),
26
27 body('video.id')
28 .optional()
20 .custom(isIdOrUUIDValid) 29 .custom(isIdOrUUIDValid)
21 .not()
22 .isEmpty()
23 .withMessage('Should have a valid videoId'), 30 .withMessage('Should have a valid videoId'),
24 body('reason') 31 body('video.startAt')
25 .custom(isAbuseReasonValid)
26 .withMessage('Should have a valid reason'),
27 body('predefinedReasons')
28 .optional()
29 .custom(isAbusePredefinedReasonsValid)
30 .withMessage('Should have a valid list of predefined reasons'),
31 body('startAt')
32 .optional() 32 .optional()
33 .customSanitizer(toIntOrNull) 33 .customSanitizer(toIntOrNull)
34 .custom(isAbuseTimestampValid) 34 .custom(isAbuseTimestampValid)
35 .withMessage('Should have valid starting time value'), 35 .withMessage('Should have valid starting time value'),
36 body('endAt') 36 body('video.endAt')
37 .optional() 37 .optional()
38 .customSanitizer(toIntOrNull) 38 .customSanitizer(toIntOrNull)
39 .custom(isAbuseTimestampValid) 39 .custom(isAbuseTimestampValid)
@@ -42,47 +42,70 @@ const abuseReportValidator = [
42 .custom(isAbuseTimestampCoherent) 42 .custom(isAbuseTimestampCoherent)
43 .withMessage('Should have a startAt timestamp beginning before endAt'), 43 .withMessage('Should have a startAt timestamp beginning before endAt'),
44 44
45 body('comment.id')
46 .optional()
47 .custom(isIdValid)
48 .withMessage('Should have a valid commentId'),
49
50 body('reason')
51 .custom(isAbuseReasonValid)
52 .withMessage('Should have a valid reason'),
53
54 body('predefinedReasons')
55 .optional()
56 .custom(isAbusePredefinedReasonsValid)
57 .withMessage('Should have a valid list of predefined reasons'),
58
45 async (req: express.Request, res: express.Response, next: express.NextFunction) => { 59 async (req: express.Request, res: express.Response, next: express.NextFunction) => {
46 logger.debug('Checking abuseReport parameters', { parameters: req.body }) 60 logger.debug('Checking abuseReport parameters', { parameters: req.body })
47 61
48 if (areValidationErrors(req, res)) return 62 if (areValidationErrors(req, res)) return
49 if (!await doesVideoExist(req.params.videoId, res)) return
50 63
51 // TODO: check comment or video (exlusive) 64 const body: AbuseCreate = req.body
65
66 if (body.video?.id && !await doesVideoExist(body.video.id, res)) return
67 if (body.account?.id && !await doesAccountIdExist(body.account.id, res)) return
68 if (body.comment?.id && !await doesCommentIdExist(body.comment.id, res)) return
69
70 if (!body.video?.id && !body.account?.id && !body.comment?.id) {
71 res.status(400)
72 .json({ error: 'video id or account id or comment id is required.' })
73
74 return
75 }
52 76
53 return next() 77 return next()
54 } 78 }
55] 79]
56 80
57const abuseGetValidator = [ 81const abuseGetValidator = [
58 param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid videoId'),
59 param('id').custom(isIdValid).not().isEmpty().withMessage('Should have a valid id'), 82 param('id').custom(isIdValid).not().isEmpty().withMessage('Should have a valid id'),
60 83
61 async (req: express.Request, res: express.Response, next: express.NextFunction) => { 84 async (req: express.Request, res: express.Response, next: express.NextFunction) => {
62 logger.debug('Checking abuseGetValidator parameters', { parameters: req.body }) 85 logger.debug('Checking abuseGetValidator parameters', { parameters: req.body })
63 86
64 if (areValidationErrors(req, res)) return 87 if (areValidationErrors(req, res)) return
65 // if (!await doesAbuseExist(req.params.id, req.params.videoId, res)) return 88 if (!await doesAbuseExist(req.params.id, res)) return
66 89
67 return next() 90 return next()
68 } 91 }
69] 92]
70 93
71const abuseUpdateValidator = [ 94const abuseUpdateValidator = [
72 param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid videoId'),
73 param('id').custom(isIdValid).not().isEmpty().withMessage('Should have a valid id'), 95 param('id').custom(isIdValid).not().isEmpty().withMessage('Should have a valid id'),
96
74 body('state') 97 body('state')
75 .optional() 98 .optional()
76 .custom(isAbuseStateValid).withMessage('Should have a valid video abuse state'), 99 .custom(isAbuseStateValid).withMessage('Should have a valid abuse state'),
77 body('moderationComment') 100 body('moderationComment')
78 .optional() 101 .optional()
79 .custom(isAbuseModerationCommentValid).withMessage('Should have a valid video moderation comment'), 102 .custom(isAbuseModerationCommentValid).withMessage('Should have a valid moderation comment'),
80 103
81 async (req: express.Request, res: express.Response, next: express.NextFunction) => { 104 async (req: express.Request, res: express.Response, next: express.NextFunction) => {
82 logger.debug('Checking abuseUpdateValidator parameters', { parameters: req.body }) 105 logger.debug('Checking abuseUpdateValidator parameters', { parameters: req.body })
83 106
84 if (areValidationErrors(req, res)) return 107 if (areValidationErrors(req, res)) return
85 // if (!await doesAbuseExist(req.params.id, req.params.videoId, res)) return 108 if (!await doesAbuseExist(req.params.id, res)) return
86 109
87 return next() 110 return next()
88 } 111 }
@@ -92,6 +115,10 @@ const abuseListValidator = [
92 query('id') 115 query('id')
93 .optional() 116 .optional()
94 .custom(isIdValid).withMessage('Should have a valid id'), 117 .custom(isIdValid).withMessage('Should have a valid id'),
118 query('filter')
119 .optional()
120 .custom(isAbuseFilterValid)
121 .withMessage('Should have a valid filter'),
95 query('predefinedReason') 122 query('predefinedReason')
96 .optional() 123 .optional()
97 .custom(isAbusePredefinedReasonValid) 124 .custom(isAbusePredefinedReasonValid)
@@ -151,10 +178,7 @@ const videoAbuseReportValidator = [
151 .optional() 178 .optional()
152 .customSanitizer(toIntOrNull) 179 .customSanitizer(toIntOrNull)
153 .custom(isAbuseTimestampValid) 180 .custom(isAbuseTimestampValid)
154 .withMessage('Should have valid ending time value') 181 .withMessage('Should have valid ending time value'),
155 .bail()
156 .custom(isAbuseTimestampCoherent)
157 .withMessage('Should have a startAt timestamp beginning before endAt'),
158 182
159 async (req: express.Request, res: express.Response, next: express.NextFunction) => { 183 async (req: express.Request, res: express.Response, next: express.NextFunction) => {
160 logger.debug('Checking videoAbuseReport parameters', { parameters: req.body }) 184 logger.debug('Checking videoAbuseReport parameters', { parameters: req.body })