X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fusers.ts;h=bc6007c6d45b6b4233489989398d877ecca7a364;hb=3318147300b4f998adf728eb0a5a14a4c1829c51;hp=548d5df4df334aa83825e3bd31cf8bab05f31ac7;hpb=35f676e5d3e5e242e84ed63da2cc78117079c7cb;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts index 548d5df4d..bc6007c6d 100644 --- a/server/middlewares/validators/users.ts +++ b/server/middlewares/validators/users.ts @@ -1,24 +1,21 @@ -import * as express from 'express' +import express from 'express' import { body, param, query } from 'express-validator' import { omit } from 'lodash' import { Hooks } from '@server/lib/plugins/hooks' import { MUserDefault } from '@server/types/models' -import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes' -import { UserRole } from '../../../shared/models/users' -import { UserRegister } from '../../../shared/models/users/user-register.model' -import { isActorPreferredUsernameValid } from '../../helpers/custom-validators/activitypub/actor' -import { isIdOrUUIDValid, toBooleanOrNull, toIntOrNull } from '../../helpers/custom-validators/misc' +import { HttpStatusCode, UserRegister, UserRight, UserRole } from '@shared/models' +import { isBooleanValid, isIdValid, toBooleanOrNull, toIntOrNull } from '../../helpers/custom-validators/misc' import { isThemeNameValid } from '../../helpers/custom-validators/plugins' import { - isNoInstanceConfigWarningModal, - isNoWelcomeModal, isUserAdminFlagsValid, isUserAutoPlayNextVideoValid, isUserAutoPlayVideoValid, isUserBlockedReasonValid, isUserDescriptionValid, isUserDisplayNameValid, + isUserNoModal, isUserNSFWPolicyValid, + isUserP2PEnabledValid, isUserPasswordValid, isUserPasswordValidOrEmpty, isUserRoleValid, @@ -28,15 +25,14 @@ import { isUserVideoQuotaValid, isUserVideosHistoryEnabledValid } from '../../helpers/custom-validators/users' -import { isVideoChannelNameValid } from '../../helpers/custom-validators/video-channels' +import { isVideoChannelDisplayNameValid, isVideoChannelUsernameValid } from '../../helpers/custom-validators/video-channels' import { logger } from '../../helpers/logger' -import { doesVideoExist } from '../../helpers/middlewares' -import { isSignupAllowed, isSignupAllowedForCurrentIP } from '../../helpers/signup' import { isThemeRegistered } from '../../lib/plugins/theme-utils' import { Redis } from '../../lib/redis' -import { UserModel } from '../../models/user/user' +import { isSignupAllowed, isSignupAllowedForCurrentIP } from '../../lib/signup' import { ActorModel } from '../../models/actor/actor' -import { areValidationErrors } from './utils' +import { UserModel } from '../../models/user/user' +import { areValidationErrors, doesVideoChannelIdExist, doesVideoExist, isValidVideoIdParam } from './shared' const usersListValidator = [ query('blocked') @@ -57,9 +53,12 @@ const usersAddValidator = [ body('username').custom(isUserUsernameValid).withMessage('Should have a valid username (lowercase alphanumeric characters)'), body('password').custom(isUserPasswordValidOrEmpty).withMessage('Should have a valid password'), body('email').isEmail().withMessage('Should have a valid email'), - body('channelName').optional().custom(isActorPreferredUsernameValid).withMessage('Should have a valid channel name'), + + body('channelName').optional().custom(isVideoChannelUsernameValid).withMessage('Should have a valid channel name'), + body('videoQuota').custom(isUserVideoQuotaValid).withMessage('Should have a valid user quota'), body('videoQuotaDaily').custom(isUserVideoQuotaDailyValid).withMessage('Should have a valid daily user quota'), + body('role') .customSanitizer(toIntOrNull) .custom(isUserRoleValid).withMessage('Should have a valid role'), @@ -73,23 +72,23 @@ const usersAddValidator = [ const authUser = res.locals.oauth.token.User if (authUser.role !== UserRole.ADMINISTRATOR && req.body.role !== UserRole.USER) { - return res - .status(HttpStatusCode.FORBIDDEN_403) - .json({ error: 'You can only create users (and not administrators or moderators)' }) + return res.fail({ + status: HttpStatusCode.FORBIDDEN_403, + message: 'You can only create users (and not administrators or moderators)' + }) } if (req.body.channelName) { if (req.body.channelName === req.body.username) { - return res - .status(HttpStatusCode.BAD_REQUEST_400) - .json({ error: 'Channel name cannot be the same as user username.' }) + return res.fail({ message: 'Channel name cannot be the same as user username.' }) } const existing = await ActorModel.loadLocalByName(req.body.channelName) if (existing) { - return res - .status(HttpStatusCode.CONFLICT_409) - .json({ error: `Channel with name ${req.body.channelName} already exists.` }) + return res.fail({ + status: HttpStatusCode.CONFLICT_409, + message: `Channel with name ${req.body.channelName} already exists.` + }) } } @@ -107,10 +106,10 @@ const usersRegisterValidator = [ body('channel.name') .optional() - .custom(isActorPreferredUsernameValid).withMessage('Should have a valid channel name'), + .custom(isVideoChannelUsernameValid).withMessage('Should have a valid channel name'), body('channel.displayName') .optional() - .custom(isVideoChannelNameValid).withMessage('Should have a valid display name'), + .custom(isVideoChannelDisplayNameValid).withMessage('Should have a valid display name'), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking usersRegister parameters', { parameters: omit(req.body, 'password') }) @@ -121,20 +120,19 @@ const usersRegisterValidator = [ const body: UserRegister = req.body if (body.channel) { if (!body.channel.name || !body.channel.displayName) { - return res - .status(HttpStatusCode.BAD_REQUEST_400) - .json({ error: 'Channel is optional but if you specify it, channel.name and channel.displayName are required.' }) + return res.fail({ message: 'Channel is optional but if you specify it, channel.name and channel.displayName are required.' }) } if (body.channel.name === body.username) { - return res.status(HttpStatusCode.BAD_REQUEST_400) - .json({ error: 'Channel name cannot be the same as user username.' }) + return res.fail({ message: 'Channel name cannot be the same as user username.' }) } const existing = await ActorModel.loadLocalByName(body.channel.name) if (existing) { - return res.status(HttpStatusCode.CONFLICT_409) - .json({ error: `Channel with name ${body.channel.name} already exists.` }) + return res.fail({ + status: HttpStatusCode.CONFLICT_409, + message: `Channel with name ${body.channel.name} already exists.` + }) } } @@ -153,8 +151,7 @@ const usersRemoveValidator = [ const user = res.locals.user if (user.username === 'root') { - return res.status(HttpStatusCode.BAD_REQUEST_400) - .json({ error: 'Cannot remove the root user' }) + return res.fail({ message: 'Cannot remove the root user' }) } return next() @@ -173,8 +170,7 @@ const usersBlockingValidator = [ const user = res.locals.user if (user.username === 'root') { - return res.status(HttpStatusCode.BAD_REQUEST_400) - .json({ error: 'Cannot block the root user' }) + return res.fail({ message: 'Cannot block the root user' }) } return next() @@ -185,9 +181,7 @@ const deleteMeValidator = [ (req: express.Request, res: express.Response, next: express.NextFunction) => { const user = res.locals.oauth.token.User if (user.username === 'root') { - return res.status(HttpStatusCode.BAD_REQUEST_400) - .json({ error: 'You cannot delete your root account.' }) - .end() + return res.fail({ message: 'You cannot delete your root account.' }) } return next() @@ -217,8 +211,7 @@ const usersUpdateValidator = [ const user = res.locals.user if (user.username === 'root' && req.body.role !== undefined && user.role !== req.body.role) { - return res.status(HttpStatusCode.BAD_REQUEST_400) - .json({ error: 'Cannot change root role.' }) + return res.fail({ message: 'Cannot change root role.' }) } return next() @@ -247,6 +240,9 @@ const usersUpdateMeValidator = [ body('autoPlayVideo') .optional() .custom(isUserAutoPlayVideoValid).withMessage('Should have a valid automatically plays video attribute'), + body('p2pEnabled') + .optional() + .custom(isUserP2PEnabledValid).withMessage('Should have a valid p2p enabled boolean'), body('videoLanguages') .optional() .custom(isUserVideoLanguages).withMessage('Should have a valid video languages attribute'), @@ -256,12 +252,17 @@ const usersUpdateMeValidator = [ body('theme') .optional() .custom(v => isThemeNameValid(v) && isThemeRegistered(v)).withMessage('Should have a valid theme'), + body('noInstanceConfigWarningModal') .optional() - .custom(v => isNoInstanceConfigWarningModal(v)).withMessage('Should have a valid noInstanceConfigWarningModal boolean'), + .custom(v => isUserNoModal(v)).withMessage('Should have a valid noInstanceConfigWarningModal boolean'), body('noWelcomeModal') .optional() - .custom(v => isNoWelcomeModal(v)).withMessage('Should have a valid noWelcomeModal boolean'), + .custom(v => isUserNoModal(v)).withMessage('Should have a valid noWelcomeModal boolean'), + body('noAccountSetupWarningModal') + .optional() + .custom(v => isUserNoModal(v)).withMessage('Should have a valid noAccountSetupWarningModal boolean'), + body('autoPlayNextVideo') .optional() .custom(v => isUserAutoPlayNextVideoValid(v)).withMessage('Should have a valid autoPlayNextVideo boolean'), @@ -273,18 +274,18 @@ const usersUpdateMeValidator = [ if (req.body.password || req.body.email) { if (user.pluginAuth !== null) { - return res.status(HttpStatusCode.BAD_REQUEST_400) - .json({ error: 'You cannot update your email or password that is associated with an external auth system.' }) + return res.fail({ message: 'You cannot update your email or password that is associated with an external auth system.' }) } if (!req.body.currentPassword) { - return res.status(HttpStatusCode.BAD_REQUEST_400) - .json({ error: 'currentPassword parameter is missing.' }) + return res.fail({ message: 'currentPassword parameter is missing.' }) } if (await user.isPasswordMatch(req.body.currentPassword) !== true) { - return res.status(HttpStatusCode.UNAUTHORIZED_401) - .json({ error: 'currentPassword is invalid.' }) + return res.fail({ + status: HttpStatusCode.UNAUTHORIZED_401, + message: 'currentPassword is invalid.' + }) } } @@ -309,7 +310,7 @@ const usersGetValidator = [ ] const usersVideoRatingValidator = [ - param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid video id'), + isValidVideoIdParam('videoId'), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking usersVideoRating parameters', { parameters: req.params }) @@ -321,6 +322,28 @@ const usersVideoRatingValidator = [ } ] +const usersVideosValidator = [ + query('isLive') + .optional() + .customSanitizer(toBooleanOrNull) + .custom(isBooleanValid).withMessage('Should have a valid live boolean'), + + query('channelId') + .optional() + .customSanitizer(toIntOrNull) + .custom(isIdValid).withMessage('Should have a valid channel id'), + + async (req: express.Request, res: express.Response, next: express.NextFunction) => { + logger.debug('Checking usersVideosValidator parameters', { parameters: req.query }) + + if (areValidationErrors(req, res)) return + + if (req.query.channelId && !await doesVideoChannelIdExist(req.query.channelId, res)) return + + return next() + } +] + const ensureUserRegistrationAllowed = [ async (req: express.Request, res: express.Response, next: express.NextFunction) => { const allowedParams = { @@ -335,8 +358,10 @@ const ensureUserRegistrationAllowed = [ ) if (allowedResult.allowed === false) { - return res.status(HttpStatusCode.FORBIDDEN_403) - .json({ error: allowedResult.errorMessage || 'User registration is not enabled or user limit is reached.' }) + return res.fail({ + status: HttpStatusCode.FORBIDDEN_403, + message: allowedResult.errorMessage || 'User registration is not enabled or user limit is reached.' + }) } return next() @@ -348,8 +373,10 @@ const ensureUserRegistrationAllowedForIP = [ const allowed = isSignupAllowedForCurrentIP(req.ip) if (allowed === false) { - return res.status(HttpStatusCode.FORBIDDEN_403) - .json({ error: 'You are not on a network authorized for registration.' }) + return res.fail({ + status: HttpStatusCode.FORBIDDEN_403, + message: 'You are not on a network authorized for registration.' + }) } return next() @@ -390,9 +417,10 @@ const usersResetPasswordValidator = [ const redisVerificationString = await Redis.Instance.getResetPasswordLink(user.id) if (redisVerificationString !== req.body.verificationString) { - return res - .status(HttpStatusCode.FORBIDDEN_403) - .json({ error: 'Invalid verification string.' }) + return res.fail({ + status: HttpStatusCode.FORBIDDEN_403, + message: 'Invalid verification string.' + }) } return next() @@ -437,9 +465,10 @@ const usersVerifyEmailValidator = [ const redisVerificationString = await Redis.Instance.getVerifyEmailLink(user.id) if (redisVerificationString !== req.body.verificationString) { - return res - .status(HttpStatusCode.FORBIDDEN_403) - .json({ error: 'Invalid verification string.' }) + return res.fail({ + status: HttpStatusCode.FORBIDDEN_403, + message: 'Invalid verification string.' + }) } return next() @@ -455,8 +484,28 @@ const ensureAuthUserOwnsAccountValidator = [ const user = res.locals.oauth.token.User if (res.locals.account.id !== user.Account.id) { - return res.status(HttpStatusCode.FORBIDDEN_403) - .json({ error: 'Only owner can access ratings list.' }) + return res.fail({ + status: HttpStatusCode.FORBIDDEN_403, + message: 'Only owner of this account can access this ressource.' + }) + } + + return next() + } +] + +const ensureCanManageChannel = [ + (req: express.Request, res: express.Response, next: express.NextFunction) => { + const user = res.locals.oauth.token.user + const isUserOwner = res.locals.videoChannel.Account.userId === user.id + + if (!isUserOwner && user.hasRight(UserRight.MANAGE_ANY_VIDEO_CHANNEL) === false) { + const message = `User ${user.username} does not have right to manage channel ${req.params.nameWithHost}.` + + return res.fail({ + status: HttpStatusCode.FORBIDDEN_403, + message + }) } return next() @@ -471,8 +520,10 @@ const ensureCanManageUser = [ if (authUser.role === UserRole.ADMINISTRATOR) return next() if (authUser.role === UserRole.MODERATOR && onUser.role === UserRole.USER) return next() - return res.status(HttpStatusCode.FORBIDDEN_403) - .json({ error: 'A moderator can only manager users.' }) + return res.fail({ + status: HttpStatusCode.FORBIDDEN_403, + message: 'A moderator can only manager users.' + }) } ] @@ -491,13 +542,15 @@ export { ensureUserRegistrationAllowed, ensureUserRegistrationAllowedForIP, usersGetValidator, + usersVideosValidator, usersAskResetPasswordValidator, usersResetPasswordValidator, usersAskSendVerifyEmailValidator, usersVerifyEmailValidator, userAutocompleteValidator, ensureAuthUserOwnsAccountValidator, - ensureCanManageUser + ensureCanManageUser, + ensureCanManageChannel } // --------------------------------------------------------------------------- @@ -515,15 +568,19 @@ async function checkUserNameOrEmailDoesNotAlreadyExist (username: string, email: const user = await UserModel.loadByUsernameOrEmail(username, email) if (user) { - res.status(HttpStatusCode.CONFLICT_409) - .json({ error: 'User with this username or email already exists.' }) + res.fail({ + status: HttpStatusCode.CONFLICT_409, + message: 'User with this username or email already exists.' + }) return false } const actor = await ActorModel.loadLocalByName(username) if (actor) { - res.status(HttpStatusCode.CONFLICT_409) - .json({ error: 'Another actor (account/channel) with this name on this instance already exists or has already existed.' }) + res.fail({ + status: HttpStatusCode.CONFLICT_409, + message: 'Another actor (account/channel) with this name on this instance already exists or has already existed.' + }) return false } @@ -535,14 +592,15 @@ async function checkUserExist (finder: () => Promise, res: express if (!user) { if (abortResponse === true) { - res.status(HttpStatusCode.NOT_FOUND_404) - .json({ error: 'User not found' }) + res.fail({ + status: HttpStatusCode.NOT_FOUND_404, + message: 'User not found' + }) } return false } res.locals.user = user - return true }