diff options
Diffstat (limited to 'server/middlewares/validators')
-rw-r--r-- | server/middlewares/validators/feeds.ts | 46 | ||||
-rw-r--r-- | server/middlewares/validators/users.ts | 4 |
2 files changed, 50 insertions, 0 deletions
diff --git a/server/middlewares/validators/feeds.ts b/server/middlewares/validators/feeds.ts index 0bfe89e6f..ee8615cae 100644 --- a/server/middlewares/validators/feeds.ts +++ b/server/middlewares/validators/feeds.ts | |||
@@ -3,6 +3,7 @@ import { param, query } from 'express-validator' | |||
3 | import { HttpStatusCode } from '../../../shared/models/http/http-error-codes' | 3 | import { HttpStatusCode } from '../../../shared/models/http/http-error-codes' |
4 | import { isValidRSSFeed } from '../../helpers/custom-validators/feeds' | 4 | import { isValidRSSFeed } from '../../helpers/custom-validators/feeds' |
5 | import { exists, isIdOrUUIDValid, isIdValid, toCompleteUUID } from '../../helpers/custom-validators/misc' | 5 | import { exists, isIdOrUUIDValid, isIdValid, toCompleteUUID } from '../../helpers/custom-validators/misc' |
6 | import { buildPodcastGroupsCache } from '../cache' | ||
6 | import { | 7 | import { |
7 | areValidationErrors, | 8 | areValidationErrors, |
8 | checkCanSeeVideo, | 9 | checkCanSeeVideo, |
@@ -43,6 +44,21 @@ function setFeedFormatContentType (req: express.Request, res: express.Response, | |||
43 | acceptableContentTypes = [ 'application/xml', 'text/xml' ] | 44 | acceptableContentTypes = [ 'application/xml', 'text/xml' ] |
44 | } | 45 | } |
45 | 46 | ||
47 | return feedContentTypeResponse(req, res, next, acceptableContentTypes) | ||
48 | } | ||
49 | |||
50 | function setFeedPodcastContentType (req: express.Request, res: express.Response, next: express.NextFunction) { | ||
51 | const acceptableContentTypes = [ 'application/rss+xml', 'application/xml', 'text/xml' ] | ||
52 | |||
53 | return feedContentTypeResponse(req, res, next, acceptableContentTypes) | ||
54 | } | ||
55 | |||
56 | function feedContentTypeResponse ( | ||
57 | req: express.Request, | ||
58 | res: express.Response, | ||
59 | next: express.NextFunction, | ||
60 | acceptableContentTypes: string[] | ||
61 | ) { | ||
46 | if (req.accepts(acceptableContentTypes)) { | 62 | if (req.accepts(acceptableContentTypes)) { |
47 | res.set('Content-Type', req.accepts(acceptableContentTypes) as string) | 63 | res.set('Content-Type', req.accepts(acceptableContentTypes) as string) |
48 | } else { | 64 | } else { |
@@ -55,6 +71,8 @@ function setFeedFormatContentType (req: express.Request, res: express.Response, | |||
55 | return next() | 71 | return next() |
56 | } | 72 | } |
57 | 73 | ||
74 | // --------------------------------------------------------------------------- | ||
75 | |||
58 | const videoFeedsValidator = [ | 76 | const videoFeedsValidator = [ |
59 | query('accountId') | 77 | query('accountId') |
60 | .optional() | 78 | .optional() |
@@ -82,6 +100,31 @@ const videoFeedsValidator = [ | |||
82 | } | 100 | } |
83 | ] | 101 | ] |
84 | 102 | ||
103 | // --------------------------------------------------------------------------- | ||
104 | |||
105 | const videoFeedsPodcastValidator = [ | ||
106 | query('videoChannelId') | ||
107 | .custom(isIdValid), | ||
108 | |||
109 | async (req: express.Request, res: express.Response, next: express.NextFunction) => { | ||
110 | if (areValidationErrors(req, res)) return | ||
111 | if (!await doesVideoChannelIdExist(req.query.videoChannelId, res)) return | ||
112 | |||
113 | return next() | ||
114 | } | ||
115 | ] | ||
116 | |||
117 | const videoFeedsPodcastSetCacheKey = [ | ||
118 | (req: express.Request, res: express.Response, next: express.NextFunction) => { | ||
119 | if (req.query.videoChannelId) { | ||
120 | res.locals.apicacheGroups = [ buildPodcastGroupsCache({ channelId: req.query.videoChannelId }) ] | ||
121 | } | ||
122 | |||
123 | return next() | ||
124 | } | ||
125 | ] | ||
126 | // --------------------------------------------------------------------------- | ||
127 | |||
85 | const videoSubscriptionFeedsValidator = [ | 128 | const videoSubscriptionFeedsValidator = [ |
86 | query('accountId') | 129 | query('accountId') |
87 | .custom(isIdValid), | 130 | .custom(isIdValid), |
@@ -126,7 +169,10 @@ const videoCommentsFeedsValidator = [ | |||
126 | export { | 169 | export { |
127 | feedsFormatValidator, | 170 | feedsFormatValidator, |
128 | setFeedFormatContentType, | 171 | setFeedFormatContentType, |
172 | setFeedPodcastContentType, | ||
129 | videoFeedsValidator, | 173 | videoFeedsValidator, |
174 | videoFeedsPodcastValidator, | ||
130 | videoSubscriptionFeedsValidator, | 175 | videoSubscriptionFeedsValidator, |
176 | videoFeedsPodcastSetCacheKey, | ||
131 | videoCommentsFeedsValidator | 177 | videoCommentsFeedsValidator |
132 | } | 178 | } |
diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts index 7ebea048d..3d311b15b 100644 --- a/server/middlewares/validators/users.ts +++ b/server/middlewares/validators/users.ts | |||
@@ -11,6 +11,7 @@ import { | |||
11 | isUserBlockedReasonValid, | 11 | isUserBlockedReasonValid, |
12 | isUserDescriptionValid, | 12 | isUserDescriptionValid, |
13 | isUserDisplayNameValid, | 13 | isUserDisplayNameValid, |
14 | isUserEmailPublicValid, | ||
14 | isUserNoModal, | 15 | isUserNoModal, |
15 | isUserNSFWPolicyValid, | 16 | isUserNSFWPolicyValid, |
16 | isUserP2PEnabledValid, | 17 | isUserP2PEnabledValid, |
@@ -213,6 +214,9 @@ const usersUpdateMeValidator = [ | |||
213 | body('password') | 214 | body('password') |
214 | .optional() | 215 | .optional() |
215 | .custom(isUserPasswordValid), | 216 | .custom(isUserPasswordValid), |
217 | body('emailPublic') | ||
218 | .optional() | ||
219 | .custom(isUserEmailPublicValid), | ||
216 | body('email') | 220 | body('email') |
217 | .optional() | 221 | .optional() |
218 | .isEmail(), | 222 | .isEmail(), |