X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Fusers.ts;h=f7033f44a6c6605e26c93ed905bf34671fa28684;hb=05a60d85997c108d39bcfb14f1ffd4c74f8b1e93;hp=eb693318fc2a998e603b6e4a6c7be073e55bd867;hpb=c5f3ff39e5351ac911418c432dac235c5aefec9e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts index eb693318f..f7033f44a 100644 --- a/server/middlewares/validators/users.ts +++ b/server/middlewares/validators/users.ts @@ -1,9 +1,8 @@ import express from 'express' import { body, param, query } from 'express-validator' -import { Hooks } from '@server/lib/plugins/hooks' -import { MUserDefault } from '@server/types/models' -import { HttpStatusCode, UserRegister, UserRight, UserRole } from '@shared/models' -import { isBooleanValid, isIdValid, toBooleanOrNull, toIntOrNull } from '../../helpers/custom-validators/misc' +import { forceNumber } from '@shared/core-utils' +import { HttpStatusCode, UserRight, UserRole } from '@shared/models' +import { exists, isBooleanValid, isIdValid, toBooleanOrNull, toIntOrNull } from '../../helpers/custom-validators/misc' import { isThemeNameValid } from '../../helpers/custom-validators/plugins' import { isUserAdminFlagsValid, @@ -24,20 +23,26 @@ import { isUserVideoQuotaValid, isUserVideosHistoryEnabledValid } from '../../helpers/custom-validators/users' -import { isVideoChannelDisplayNameValid, isVideoChannelUsernameValid } from '../../helpers/custom-validators/video-channels' +import { isVideoChannelUsernameValid } from '../../helpers/custom-validators/video-channels' import { logger } from '../../helpers/logger' import { isThemeRegistered } from '../../lib/plugins/theme-utils' import { Redis } from '../../lib/redis' -import { isSignupAllowed, isSignupAllowedForCurrentIP } from '../../lib/signup' import { ActorModel } from '../../models/actor/actor' -import { UserModel } from '../../models/user/user' -import { areValidationErrors, doesVideoChannelIdExist, doesVideoExist, isValidVideoIdParam } from './shared' +import { + areValidationErrors, + checkUserEmailExist, + checkUserIdExist, + checkUserNameOrEmailDoNotAlreadyExist, + doesVideoChannelIdExist, + doesVideoExist, + isValidVideoIdParam +} from './shared' const usersListValidator = [ query('blocked') .optional() .customSanitizer(toBooleanOrNull) - .isBoolean().withMessage('Should be a valid blocked boolena'), + .isBoolean().withMessage('Should be a valid blocked boolean'), (req: express.Request, res: express.Response, next: express.NextFunction) => { if (areValidationErrors(req, res)) return @@ -74,7 +79,7 @@ const usersAddValidator = [ async (req: express.Request, res: express.Response, next: express.NextFunction) => { if (areValidationErrors(req, res, { omitBodyLog: true })) return - if (!await checkUserNameOrEmailDoesNotAlreadyExist(req.body.username, req.body.email, res)) return + if (!await checkUserNameOrEmailDoNotAlreadyExist(req.body.username, req.body.email, res)) return const authUser = res.locals.oauth.token.User if (authUser.role !== UserRole.ADMINISTRATOR && req.body.role !== UserRole.USER) { @@ -102,51 +107,6 @@ const usersAddValidator = [ } ] -const usersRegisterValidator = [ - body('username') - .custom(isUserUsernameValid), - body('password') - .custom(isUserPasswordValid), - body('email') - .isEmail(), - body('displayName') - .optional() - .custom(isUserDisplayNameValid), - - body('channel.name') - .optional() - .custom(isVideoChannelUsernameValid), - body('channel.displayName') - .optional() - .custom(isVideoChannelDisplayNameValid), - - async (req: express.Request, res: express.Response, next: express.NextFunction) => { - if (areValidationErrors(req, res, { omitBodyLog: true })) return - if (!await checkUserNameOrEmailDoesNotAlreadyExist(req.body.username, req.body.email, res)) return - - const body: UserRegister = req.body - if (body.channel) { - if (!body.channel.name || !body.channel.displayName) { - 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.fail({ message: 'Channel name cannot be the same as user username.' }) - } - - const existing = await ActorModel.loadLocalByName(body.channel.name) - if (existing) { - return res.fail({ - status: HttpStatusCode.CONFLICT_409, - message: `Channel with name ${body.channel.name} already exists.` - }) - } - } - - return next() - } -] - const usersRemoveValidator = [ param('id') .custom(isIdValid), @@ -358,45 +318,6 @@ const usersVideosValidator = [ } ] -const ensureUserRegistrationAllowed = [ - async (req: express.Request, res: express.Response, next: express.NextFunction) => { - 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.fail({ - status: HttpStatusCode.FORBIDDEN_403, - message: allowedResult.errorMessage || 'User registration is not enabled or user limit is reached.' - }) - } - - return next() - } -] - -const ensureUserRegistrationAllowedForIP = [ - (req: express.Request, res: express.Response, next: express.NextFunction) => { - const allowed = isSignupAllowedForCurrentIP(req.ip) - - if (allowed === false) { - return res.fail({ - status: HttpStatusCode.FORBIDDEN_403, - message: 'You are not on a network authorized for registration.' - }) - } - - return next() - } -] - const usersAskResetPasswordValidator = [ body('email') .isEmail(), @@ -435,7 +356,7 @@ const usersResetPasswordValidator = [ if (!await checkUserIdExist(req.params.id, res)) return const user = res.locals.user - const redisVerificationString = await Redis.Instance.getResetPasswordLink(user.id) + const redisVerificationString = await Redis.Instance.getResetPasswordVerificationString(user.id) if (redisVerificationString !== req.body.verificationString) { return res.fail({ @@ -448,57 +369,40 @@ const usersResetPasswordValidator = [ } ] -const usersAskSendVerifyEmailValidator = [ - body('email').isEmail().not().isEmpty().withMessage('Should have a valid email'), +const usersCheckCurrentPasswordFactory = (targetUserIdGetter: (req: express.Request) => number | string) => { + return [ + body('currentPassword').optional().custom(exists), - async (req: express.Request, res: express.Response, next: express.NextFunction) => { - if (areValidationErrors(req, res)) return + async (req: express.Request, res: express.Response, next: express.NextFunction) => { + if (areValidationErrors(req, res)) return - const exists = await checkUserEmailExist(req.body.email, res, false) - 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(HttpStatusCode.NO_CONTENT_204).end() - } - - if (res.locals.user.pluginAuth) { - return res.fail({ - status: HttpStatusCode.CONFLICT_409, - message: 'Cannot ask verification email of a user that uses a plugin authentication.' - }) - } - - return next() - } -] - -const usersVerifyEmailValidator = [ - param('id') - .isInt().not().isEmpty().withMessage('Should have a valid id'), + const user = res.locals.oauth.token.User + const isAdminOrModerator = user.role === UserRole.ADMINISTRATOR || user.role === UserRole.MODERATOR + const targetUserId = forceNumber(targetUserIdGetter(req)) - body('verificationString') - .not().isEmpty().withMessage('Should have a valid verification string'), - body('isPendingEmail') - .optional() - .customSanitizer(toBooleanOrNull), + // Admin/moderator action on another user, skip the password check + if (isAdminOrModerator && targetUserId !== user.id) { + return next() + } - async (req: express.Request, res: express.Response, next: express.NextFunction) => { - if (areValidationErrors(req, res)) return - if (!await checkUserIdExist(req.params.id, res)) return + if (!req.body.currentPassword) { + return res.fail({ + status: HttpStatusCode.BAD_REQUEST_400, + message: 'currentPassword is missing' + }) + } - const user = res.locals.user - const redisVerificationString = await Redis.Instance.getVerifyEmailLink(user.id) + if (await user.isPasswordMatch(req.body.currentPassword) !== true) { + return res.fail({ + status: HttpStatusCode.FORBIDDEN_403, + message: 'currentPassword is invalid.' + }) + } - if (redisVerificationString !== req.body.verificationString) { - return res.fail({ - status: HttpStatusCode.FORBIDDEN_403, - message: 'Invalid verification string.' - }) + return next() } - - return next() - } -] + ] +} const userAutocompleteValidator = [ param('search') @@ -561,74 +465,18 @@ export { usersListValidator, usersAddValidator, deleteMeValidator, - usersRegisterValidator, usersBlockingValidator, usersRemoveValidator, usersUpdateValidator, usersUpdateMeValidator, usersVideoRatingValidator, - ensureUserRegistrationAllowed, - ensureUserRegistrationAllowedForIP, + usersCheckCurrentPasswordFactory, usersGetValidator, usersVideosValidator, usersAskResetPasswordValidator, usersResetPasswordValidator, - usersAskSendVerifyEmailValidator, - usersVerifyEmailValidator, userAutocompleteValidator, ensureAuthUserOwnsAccountValidator, ensureCanModerateUser, ensureCanManageChannelOrAccount } - -// --------------------------------------------------------------------------- - -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) { - return checkUserExist(() => UserModel.loadByEmail(email), res, abortResponse) -} - -async function checkUserNameOrEmailDoesNotAlreadyExist (username: string, email: string, res: express.Response) { - const user = await UserModel.loadByUsernameOrEmail(username, email) - - if (user) { - 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.fail({ - status: HttpStatusCode.CONFLICT_409, - message: 'Another actor (account/channel) with this name on this instance already exists or has already existed.' - }) - return false - } - - return true -} - -async function checkUserExist (finder: () => Promise, res: express.Response, abortResponse = true) { - const user = await finder() - - if (!user) { - if (abortResponse === true) { - res.fail({ - status: HttpStatusCode.NOT_FOUND_404, - message: 'User not found' - }) - } - - return false - } - - res.locals.user = user - return true -}