import { omit } from 'lodash'
import { isIdOrUUIDValid, toBooleanOrNull, toIntOrNull } from '../../helpers/custom-validators/misc'
import {
+ isNoInstanceConfigWarningModal, isNoWelcomeModal,
isUserAdminFlagsValid,
isUserAutoPlayVideoValid,
isUserBlockedReasonValid,
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 usersAddValidator = [
body('username').custom(isUserUsernameValid).withMessage('Should have a valid username (lowercase alphanumeric characters)'),
body('email').isEmail().withMessage('Should have a valid email'),
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').custom(isUserRoleValid).withMessage('Should have a valid role'),
+ body('role')
+ .customSanitizer(toIntOrNull)
+ .custom(isUserRoleValid).withMessage('Should have a valid role'),
body('adminFlags').optional().custom(isUserAdminFlagsValid).withMessage('Should have a valid admin flags'),
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
if (areValidationErrors(req, res)) return
if (!await checkUserNameOrEmailDoesNotAlreadyExist(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) {
+ return res.status(403)
+ .json({ error: 'You can only create users (and not administrators or moderators)' })
+ }
+
return next()
}
]
if (body.channel) {
if (!body.channel.name || !body.channel.displayName) {
return res.status(400)
- .send({ error: 'Channel is optional but if you specify it, channel.name and channel.displayName are required.' })
- .end()
+ .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)
- .send({ error: 'Channel name cannot be the same than user username.' })
- .end()
+ .json({ error: 'Channel name cannot be the same than user username.' })
}
const existing = await ActorModel.loadLocalByName(body.channel.name)
if (existing) {
return res.status(409)
- .send({ error: `Channel with name ${body.channel.name} already exists.` })
- .end()
+ .json({ error: `Channel with name ${body.channel.name} already exists.` })
}
}
const user = res.locals.user
if (user.username === 'root') {
return res.status(400)
- .send({ error: 'Cannot remove the root user' })
- .end()
+ .json({ error: 'Cannot remove the root user' })
}
return next()
const user = res.locals.user
if (user.username === 'root') {
return res.status(400)
- .send({ error: 'Cannot block the root user' })
- .end()
+ .json({ error: 'Cannot block the root user' })
}
return next()
const user = res.locals.oauth.token.User
if (user.username === 'root') {
return res.status(400)
- .send({ error: 'You cannot delete your root account.' })
+ .json({ error: 'You cannot delete your root account.' })
.end()
}
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('role').optional().custom(isUserRoleValid).withMessage('Should have a valid role'),
+ body('role')
+ .optional()
+ .customSanitizer(toIntOrNull)
+ .custom(isUserRoleValid).withMessage('Should have a valid role'),
body('adminFlags').optional().custom(isUserAdminFlagsValid).withMessage('Should have a valid admin flags'),
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
const user = res.locals.user
if (user.username === 'root' && req.body.role !== undefined && user.role !== req.body.role) {
return res.status(400)
- .send({ error: 'Cannot change root role.' })
- .end()
+ .json({ error: 'Cannot change root role.' })
}
return next()
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'),
+ body('noWelcomeModal')
+ .optional()
+ .custom(v => isNoWelcomeModal(v)).withMessage('Should have a valid noWelcomeModal boolean'),
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
logger.debug('Checking usersUpdateMe parameters', { parameters: omit(req.body, 'password') })
if (req.body.password || req.body.email) {
if (!req.body.currentPassword) {
return res.status(400)
- .send({ error: 'currentPassword parameter is missing.' })
+ .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)
- .send({ error: 'currentPassword is invalid.' })
- .end()
+ .json({ error: 'currentPassword is invalid.' })
}
}
const allowed = await isSignupAllowed()
if (allowed === false) {
return res.status(403)
- .send({ error: 'User registration is not enabled or user limit is reached.' })
- .end()
+ .json({ error: 'User registration is not enabled or user limit is reached.' })
}
return next()
if (allowed === false) {
return res.status(403)
- .send({ error: 'You are not on a network authorized for registration.' })
- .end()
+ .json({ error: 'You are not on a network authorized for registration.' })
}
return next()
if (redisVerificationString !== req.body.verificationString) {
return res
.status(403)
- .send({ error: 'Invalid verification string.' })
- .end()
+ .json({ error: 'Invalid verification string.' })
}
return next()
if (redisVerificationString !== req.body.verificationString) {
return res
.status(403)
- .send({ error: 'Invalid verification string.' })
- .end()
+ .json({ error: 'Invalid verification string.' })
}
return next()
if (res.locals.account.id !== user.Account.id) {
return res.status(403)
- .send({ error: 'Only owner can access ratings list.' })
- .end()
+ .json({ error: 'Only owner can access ratings list.' })
}
return next()
}
]
+const ensureCanManageUser = [
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ const authUser = res.locals.oauth.token.User
+ const onUser = res.locals.user
+
+ if (authUser.role === UserRole.ADMINISTRATOR) return next()
+ if (authUser.role === UserRole.MODERATOR && onUser.role === UserRole.USER) return next()
+
+ return res.status(403)
+ .json({ error: 'A moderator can only manager users.' })
+ }
+]
+
// ---------------------------------------------------------------------------
export {
usersAskSendVerifyEmailValidator,
usersVerifyEmailValidator,
userAutocompleteValidator,
- ensureAuthUserOwnsAccountValidator
+ ensureAuthUserOwnsAccountValidator,
+ ensureCanManageUser
}
// ---------------------------------------------------------------------------
if (user) {
res.status(409)
- .send({ error: 'User with this username or email already exists.' })
- .end()
+ .json({ error: 'User with this username or email already exists.' })
return false
}
const actor = await ActorModel.loadLocalByName(username)
if (actor) {
res.status(409)
- .send({ error: 'Another actor (account/channel) with this name on this instance already exists or has already existed.' })
- .end()
+ .json({ error: 'Another actor (account/channel) with this name on this instance already exists or has already existed.' })
return false
}
return true
}
-async function checkUserExist (finder: () => Bluebird<UserModel>, res: express.Response, abortResponse = true) {
+async function checkUserExist (finder: () => Bluebird<MUserDefault>, res: express.Response, abortResponse = true) {
const user = await finder()
if (!user) {
if (abortResponse === true) {
res.status(404)
- .send({ error: 'User not found' })
- .end()
+ .json({ error: 'User not found' })
}
return false
projects / github / Chocobozzz / PeerTube.git / blobdiff