X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fusers.ts;h=548d5df4df334aa83825e3bd31cf8bab05f31ac7;hb=4d7ce9218a3f695bf3d013cbdce1c5c6a5221927;hp=b3466333caa9bf645dc4b6506ce216e685cabefb;hpb=c1e5bd23d557976ba11f89c53a00c1657a7ea890;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts index b3466333c..548d5df4d 100644 --- a/server/middlewares/validators/users.ts +++ b/server/middlewares/validators/users.ts @@ -1,8 +1,14 @@ -import * as Bluebird from 'bluebird' import * as express from 'express' -import { body, param } from 'express-validator' +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 { isThemeNameValid } from '../../helpers/custom-validators/plugins' import { isNoInstanceConfigWarningModal, isNoWelcomeModal, @@ -14,6 +20,7 @@ import { isUserDisplayNameValid, isUserNSFWPolicyValid, isUserPasswordValid, + isUserPasswordValidOrEmpty, isUserRoleValid, isUserUsernameValid, isUserVideoLanguages, @@ -21,25 +28,36 @@ import { isUserVideoQuotaValid, isUserVideosHistoryEnabledValid } from '../../helpers/custom-validators/users' +import { isVideoChannelNameValid } 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/account/user' +import { UserModel } from '../../models/user/user' +import { ActorModel } from '../../models/actor/actor' import { areValidationErrors } from './utils' -import { ActorModel } from '../../models/activitypub/actor' -import { isActorPreferredUsernameValid } from '../../helpers/custom-validators/activitypub/actor' -import { isVideoChannelNameValid } from '../../helpers/custom-validators/video-channels' -import { UserRegister } from '../../../shared/models/users/user-register.model' -import { isThemeNameValid } from '../../helpers/custom-validators/plugins' -import { isThemeRegistered } from '../../lib/plugins/theme-utils' -import { doesVideoExist } from '../../helpers/middlewares' -import { UserRole } from '../../../shared/models/users' -import { MUserDefault } from '@server/typings/models' + +const usersListValidator = [ + query('blocked') + .optional() + .customSanitizer(toBooleanOrNull) + .isBoolean().withMessage('Should be a valid boolean banned state'), + + (req: express.Request, res: express.Response, next: express.NextFunction) => { + logger.debug('Checking usersList parameters', { parameters: req.query }) + + if (areValidationErrors(req, res)) return + + return next() + } +] const usersAddValidator = [ body('username').custom(isUserUsernameValid).withMessage('Should have a valid username (lowercase alphanumeric characters)'), - body('password').custom(isUserPasswordValid).withMessage('Should have a valid password'), + 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('videoQuota').custom(isUserVideoQuotaValid).withMessage('Should have a valid user quota'), body('videoQuotaDaily').custom(isUserVideoQuotaDailyValid).withMessage('Should have a valid daily user quota'), body('role') @@ -55,10 +73,26 @@ const usersAddValidator = [ const authUser = res.locals.oauth.token.User if (authUser.role !== UserRole.ADMINISTRATOR && req.body.role !== UserRole.USER) { - return res.status(403) + return res + .status(HttpStatusCode.FORBIDDEN_403) .json({ error: '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.' }) + } + + 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 next() } ] @@ -87,18 +121,19 @@ const usersRegisterValidator = [ const body: UserRegister = req.body if (body.channel) { if (!body.channel.name || !body.channel.displayName) { - return res.status(400) + return res + .status(HttpStatusCode.BAD_REQUEST_400) .json({ error: 'Channel is optional but if you specify it, channel.name and channel.displayName are required.' }) } if (body.channel.name === body.username) { - return res.status(400) + return res.status(HttpStatusCode.BAD_REQUEST_400) .json({ error: 'Channel name cannot be the same as user username.' }) } const existing = await ActorModel.loadLocalByName(body.channel.name) if (existing) { - return res.status(409) + return res.status(HttpStatusCode.CONFLICT_409) .json({ error: `Channel with name ${body.channel.name} already exists.` }) } } @@ -118,7 +153,7 @@ const usersRemoveValidator = [ const user = res.locals.user if (user.username === 'root') { - return res.status(400) + return res.status(HttpStatusCode.BAD_REQUEST_400) .json({ error: 'Cannot remove the root user' }) } @@ -138,7 +173,7 @@ const usersBlockingValidator = [ const user = res.locals.user if (user.username === 'root') { - return res.status(400) + return res.status(HttpStatusCode.BAD_REQUEST_400) .json({ error: 'Cannot block the root user' }) } @@ -147,10 +182,10 @@ const usersBlockingValidator = [ ] const deleteMeValidator = [ - async (req: express.Request, res: express.Response, next: express.NextFunction) => { + (req: express.Request, res: express.Response, next: express.NextFunction) => { const user = res.locals.oauth.token.User if (user.username === 'root') { - return res.status(400) + return res.status(HttpStatusCode.BAD_REQUEST_400) .json({ error: 'You cannot delete your root account.' }) .end() } @@ -161,11 +196,13 @@ const deleteMeValidator = [ const usersUpdateValidator = [ param('id').isInt().not().isEmpty().withMessage('Should have a valid id'), + body('password').optional().custom(isUserPasswordValid).withMessage('Should have a valid password'), body('email').optional().isEmail().withMessage('Should have a valid email attribute'), body('emailVerified').optional().isBoolean().withMessage('Should have a valid email verified attribute'), body('videoQuota').optional().custom(isUserVideoQuotaValid).withMessage('Should have a valid user quota'), body('videoQuotaDaily').optional().custom(isUserVideoQuotaDailyValid).withMessage('Should have a valid daily user quota'), + body('pluginAuth').optional(), body('role') .optional() .customSanitizer(toIntOrNull) @@ -180,8 +217,8 @@ const usersUpdateValidator = [ const user = res.locals.user if (user.username === 'root' && req.body.role !== undefined && user.role !== req.body.role) { - return res.status(400) - .json({ error: 'Cannot change root role.' }) + return res.status(HttpStatusCode.BAD_REQUEST_400) + .json({ error: 'Cannot change root role.' }) } return next() @@ -232,16 +269,21 @@ const usersUpdateMeValidator = [ async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking usersUpdateMe parameters', { parameters: omit(req.body, 'password') }) + const user = res.locals.oauth.token.User + 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.' }) + } + if (!req.body.currentPassword) { - return res.status(400) + return res.status(HttpStatusCode.BAD_REQUEST_400) .json({ error: 'currentPassword parameter is missing.' }) - .end() } - const user = res.locals.oauth.token.User if (await user.isPasswordMatch(req.body.currentPassword) !== true) { - return res.status(401) + return res.status(HttpStatusCode.UNAUTHORIZED_401) .json({ error: 'currentPassword is invalid.' }) } } @@ -254,12 +296,13 @@ const usersUpdateMeValidator = [ const usersGetValidator = [ param('id').isInt().not().isEmpty().withMessage('Should have a valid id'), + query('withStats').optional().isBoolean().withMessage('Should have a valid stats flag'), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking usersGet parameters', { parameters: req.params }) if (areValidationErrors(req, res)) return - if (!await checkUserIdExist(req.params.id, res)) return + if (!await checkUserIdExist(req.params.id, res, req.query.withStats)) return return next() } @@ -280,10 +323,20 @@ const usersVideoRatingValidator = [ const ensureUserRegistrationAllowed = [ async (req: express.Request, res: express.Response, next: express.NextFunction) => { - const allowed = await isSignupAllowed() - if (allowed === false) { - return res.status(403) - .json({ error: 'User registration is not enabled or user limit is reached.' }) + const allowedParams = { + body: req.body, + ip: req.ip + } + + const allowedResult = await Hooks.wrapPromiseFun( + isSignupAllowed, + allowedParams, + 'filter:api.user.signup.allowed.result' + ) + + 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 next() @@ -291,11 +344,11 @@ const ensureUserRegistrationAllowed = [ ] const ensureUserRegistrationAllowedForIP = [ - async (req: express.Request, res: express.Response, next: express.NextFunction) => { + (req: express.Request, res: express.Response, next: express.NextFunction) => { const allowed = isSignupAllowedForCurrentIP(req.ip) if (allowed === false) { - return res.status(403) + return res.status(HttpStatusCode.FORBIDDEN_403) .json({ error: 'You are not on a network authorized for registration.' }) } @@ -315,7 +368,7 @@ const usersAskResetPasswordValidator = [ if (!exists) { logger.debug('User with email %s does not exist (asking reset password).', req.body.email) // Do not leak our emails - return res.status(204).end() + return res.status(HttpStatusCode.NO_CONTENT_204).end() } return next() @@ -338,7 +391,7 @@ const usersResetPasswordValidator = [ if (redisVerificationString !== req.body.verificationString) { return res - .status(403) + .status(HttpStatusCode.FORBIDDEN_403) .json({ error: 'Invalid verification string.' }) } @@ -357,7 +410,7 @@ const usersAskSendVerifyEmailValidator = [ if (!exists) { logger.debug('User with email %s does not exist (asking verify email).', req.body.email) // Do not leak our emails - return res.status(204).end() + return res.status(HttpStatusCode.NO_CONTENT_204).end() } return next() @@ -385,7 +438,7 @@ const usersVerifyEmailValidator = [ if (redisVerificationString !== req.body.verificationString) { return res - .status(403) + .status(HttpStatusCode.FORBIDDEN_403) .json({ error: 'Invalid verification string.' }) } @@ -398,11 +451,11 @@ const userAutocompleteValidator = [ ] const ensureAuthUserOwnsAccountValidator = [ - async (req: express.Request, res: express.Response, next: express.NextFunction) => { + (req: express.Request, res: express.Response, next: express.NextFunction) => { const user = res.locals.oauth.token.User if (res.locals.account.id !== user.Account.id) { - return res.status(403) + return res.status(HttpStatusCode.FORBIDDEN_403) .json({ error: 'Only owner can access ratings list.' }) } @@ -418,7 +471,7 @@ const ensureCanManageUser = [ if (authUser.role === UserRole.ADMINISTRATOR) return next() if (authUser.role === UserRole.MODERATOR && onUser.role === UserRole.USER) return next() - return res.status(403) + return res.status(HttpStatusCode.FORBIDDEN_403) .json({ error: 'A moderator can only manager users.' }) } ] @@ -426,6 +479,7 @@ const ensureCanManageUser = [ // --------------------------------------------------------------------------- export { + usersListValidator, usersAddValidator, deleteMeValidator, usersRegisterValidator, @@ -448,8 +502,9 @@ export { // --------------------------------------------------------------------------- -function checkUserIdExist (id: number, res: express.Response) { - return checkUserExist(() => UserModel.loadById(id), res) +function checkUserIdExist (idArg: number | string, res: express.Response, withStats = false) { + const id = parseInt(idArg + '', 10) + return checkUserExist(() => UserModel.loadByIdWithChannels(id, withStats), res) } function checkUserEmailExist (email: string, res: express.Response, abortResponse = true) { @@ -460,14 +515,14 @@ async function checkUserNameOrEmailDoesNotAlreadyExist (username: string, email: const user = await UserModel.loadByUsernameOrEmail(username, email) if (user) { - res.status(409) + res.status(HttpStatusCode.CONFLICT_409) .json({ error: 'User with this username or email already exists.' }) return false } const actor = await ActorModel.loadLocalByName(username) if (actor) { - res.status(409) + res.status(HttpStatusCode.CONFLICT_409) .json({ error: 'Another actor (account/channel) with this name on this instance already exists or has already existed.' }) return false } @@ -475,12 +530,12 @@ async function checkUserNameOrEmailDoesNotAlreadyExist (username: string, email: return true } -async function checkUserExist (finder: () => Bluebird, res: express.Response, abortResponse = true) { +async function checkUserExist (finder: () => Promise, res: express.Response, abortResponse = true) { const user = await finder() if (!user) { if (abortResponse === true) { - res.status(404) + res.status(HttpStatusCode.NOT_FOUND_404) .json({ error: 'User not found' }) }