X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fusers%2Findex.ts;h=96366d68c28b9d074aab88ab8f6926d7174c5532;hb=cb0eda5602a21d1626a7face32de6153ed07b5f9;hp=98eb2beedaf34581b55cbc18e2817484842b821b;hpb=2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/users/index.ts b/server/controllers/api/users/index.ts index 98eb2beed..96366d68c 100644 --- a/server/controllers/api/users/index.ts +++ b/server/controllers/api/users/index.ts @@ -1,82 +1,65 @@ -import * as express from 'express' -import * as RateLimit from 'express-rate-limit' -import { UserCreate, UserRight, UserRole, UserUpdate } from '../../../../shared' +import express from 'express' +import { tokensRouter } from '@server/controllers/api/users/token' +import { Hooks } from '@server/lib/plugins/hooks' +import { OAuthTokenModel } from '@server/models/oauth/oauth-token' +import { MUserAccountDefault } from '@server/types/models' +import { pick } from '@shared/core-utils' +import { HttpStatusCode, UserCreate, UserCreateResult, UserRight, UserUpdate } from '@shared/models' +import { auditLoggerFactory, getAuditIdFromRes, UserAuditView } from '../../../helpers/audit-logger' import { logger } from '../../../helpers/logger' import { generateRandomString, getFormattedObjects } from '../../../helpers/utils' import { WEBSERVER } from '../../../initializers/constants' +import { sequelizeTypescript } from '../../../initializers/database' import { Emailer } from '../../../lib/emailer' import { Redis } from '../../../lib/redis' -import { createUserAccountAndChannelAndPlaylist, sendVerifyUserEmail } from '../../../lib/user' +import { buildUser, createUserAccountAndChannelAndPlaylist } from '../../../lib/user' import { + adminUsersSortValidator, asyncMiddleware, asyncRetryTransactionMiddleware, authenticate, ensureUserHasRight, - ensureUserRegistrationAllowed, - ensureUserRegistrationAllowedForIP, paginationValidator, setDefaultPagination, setDefaultSort, - token, userAutocompleteValidator, usersAddValidator, usersGetValidator, - usersRegisterValidator, + usersListValidator, usersRemoveValidator, - usersSortValidator, usersUpdateValidator } from '../../../middlewares' import { + ensureCanModerateUser, usersAskResetPasswordValidator, - usersAskSendVerifyEmailValidator, usersBlockingValidator, - usersResetPasswordValidator, - usersVerifyEmailValidator, - ensureCanManageUser + usersResetPasswordValidator } from '../../../middlewares/validators' -import { UserModel } from '../../../models/account/user' -import { auditLoggerFactory, getAuditIdFromRes, UserAuditView } from '../../../helpers/audit-logger' +import { UserModel } from '../../../models/user/user' +import { emailVerificationRouter } from './email-verification' import { meRouter } from './me' -import { deleteUserToken } from '../../../lib/oauth-model' +import { myAbusesRouter } from './my-abuses' import { myBlocklistRouter } from './my-blocklist' -import { myVideoPlaylistsRouter } from './my-video-playlists' import { myVideosHistoryRouter } from './my-history' import { myNotificationsRouter } from './my-notifications' -import { Notifier } from '../../../lib/notifier' import { mySubscriptionsRouter } from './my-subscriptions' -import { CONFIG } from '../../../initializers/config' -import { sequelizeTypescript } from '../../../initializers/database' -import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model' -import { UserRegister } from '../../../../shared/models/users/user-register.model' -import { MUser, MUserAccountDefault } from '@server/typings/models' -import { Hooks } from '@server/lib/plugins/hooks' +import { myVideoPlaylistsRouter } from './my-video-playlists' +import { registrationsRouter } from './registrations' +import { twoFactorRouter } from './two-factor' const auditLogger = auditLoggerFactory('users') -const loginRateLimiter = RateLimit({ - windowMs: CONFIG.RATES_LIMIT.LOGIN.WINDOW_MS, - max: CONFIG.RATES_LIMIT.LOGIN.MAX -}) - -// @ts-ignore -const signupRateLimiter = RateLimit({ - windowMs: CONFIG.RATES_LIMIT.SIGNUP.WINDOW_MS, - max: CONFIG.RATES_LIMIT.SIGNUP.MAX, - skipFailedRequests: true -}) - -// @ts-ignore -const askSendEmailLimiter = new RateLimit({ - windowMs: CONFIG.RATES_LIMIT.ASK_SEND_EMAIL.WINDOW_MS, - max: CONFIG.RATES_LIMIT.ASK_SEND_EMAIL.MAX -}) - const usersRouter = express.Router() +usersRouter.use('/', emailVerificationRouter) +usersRouter.use('/', registrationsRouter) +usersRouter.use('/', twoFactorRouter) +usersRouter.use('/', tokensRouter) usersRouter.use('/', myNotificationsRouter) usersRouter.use('/', mySubscriptionsRouter) usersRouter.use('/', myBlocklistRouter) usersRouter.use('/', myVideosHistoryRouter) usersRouter.use('/', myVideoPlaylistsRouter) +usersRouter.use('/', myAbusesRouter) usersRouter.use('/', meRouter) usersRouter.get('/autocomplete', @@ -88,9 +71,10 @@ usersRouter.get('/', authenticate, ensureUserHasRight(UserRight.MANAGE_USERS), paginationValidator, - usersSortValidator, + adminUsersSortValidator, setDefaultSort, setDefaultPagination, + usersListValidator, asyncMiddleware(listUsers) ) @@ -98,14 +82,14 @@ usersRouter.post('/:id/block', authenticate, ensureUserHasRight(UserRight.MANAGE_USERS), asyncMiddleware(usersBlockingValidator), - ensureCanManageUser, + ensureCanModerateUser, asyncMiddleware(blockUser) ) usersRouter.post('/:id/unblock', authenticate, ensureUserHasRight(UserRight.MANAGE_USERS), asyncMiddleware(usersBlockingValidator), - ensureCanManageUser, + ensureCanModerateUser, asyncMiddleware(unblockUser) ) @@ -123,19 +107,11 @@ usersRouter.post('/', asyncRetryTransactionMiddleware(createUser) ) -usersRouter.post('/register', - signupRateLimiter, - asyncMiddleware(ensureUserRegistrationAllowed), - ensureUserRegistrationAllowedForIP, - asyncMiddleware(usersRegisterValidator), - asyncRetryTransactionMiddleware(registerUser) -) - usersRouter.put('/:id', authenticate, ensureUserHasRight(UserRight.MANAGE_USERS), asyncMiddleware(usersUpdateValidator), - ensureCanManageUser, + ensureCanModerateUser, asyncMiddleware(updateUser) ) @@ -143,7 +119,7 @@ usersRouter.delete('/:id', authenticate, ensureUserHasRight(UserRight.MANAGE_USERS), asyncMiddleware(usersRemoveValidator), - ensureCanManageUser, + ensureCanModerateUser, asyncMiddleware(removeUser) ) @@ -157,24 +133,6 @@ usersRouter.post('/:id/reset-password', asyncMiddleware(resetUserPassword) ) -usersRouter.post('/ask-send-verify-email', - askSendEmailLimiter, - asyncMiddleware(usersAskSendVerifyEmailValidator), - asyncMiddleware(reSendVerifyUserEmail) -) - -usersRouter.post('/:id/verify-email', - asyncMiddleware(usersVerifyEmailValidator), - asyncMiddleware(verifyUserEmail) -) - -usersRouter.post('/token', - loginRateLimiter, - token, - tokenSuccess -) -// TODO: Once https://github.com/oauthjs/node-oauth2-server/pull/289 is merged, implement revoke token route - // --------------------------------------------------------------------------- export { @@ -185,17 +143,12 @@ export { async function createUser (req: express.Request, res: express.Response) { const body: UserCreate = req.body - const userToCreate = new UserModel({ - username: body.username, - password: body.password, - email: body.email, - nsfwPolicy: CONFIG.INSTANCE.DEFAULT_NSFW_POLICY, - autoPlayVideo: true, - role: body.role, - videoQuota: body.videoQuota, - videoQuotaDaily: body.videoQuotaDaily, - adminFlags: body.adminFlags || UserAdminFlag.NONE - }) as MUser + + const userToCreate = buildUser({ + ...pick(body, [ 'username', 'password', 'email', 'role', 'videoQuota', 'videoQuotaDaily', 'adminFlags' ]), + + emailVerified: null + }) // NB: due to the validator usersAddValidator, password==='' can only be true if we can send the mail. const createPassword = userToCreate.password === '' @@ -203,7 +156,10 @@ async function createUser (req: express.Request, res: express.Response) { userToCreate.password = await generateRandomString(20) } - const { user, account, videoChannel } = await createUserAccountAndChannelAndPlaylist({ userToCreate: userToCreate }) + const { user, account, videoChannel } = await createUserAccountAndChannelAndPlaylist({ + userToCreate, + channelNames: body.channelName && { name: body.channelName, displayName: body.channelName } + }) auditLogger.create(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON())) logger.info('User %s with its channel and account created.', body.username) @@ -213,10 +169,10 @@ async function createUser (req: express.Request, res: express.Response) { logger.info('Sending to user %s a create password email', body.username) const verificationString = await Redis.Instance.setCreatePasswordVerificationString(user.id) const url = WEBSERVER.URL + '/reset-password?userId=' + user.id + '&verificationString=' + verificationString - await Emailer.Instance.addPasswordCreateEmailJob(userToCreate.username, user.email, url) + Emailer.Instance.addPasswordCreateEmailJob(userToCreate.username, user.email, url) } - Hooks.runAction('action:api.user.created', { body, user, account, videoChannel }) + Hooks.runAction('action:api.user.created', { body, user, account, videoChannel, req, res }) return res.json({ user: { @@ -224,43 +180,8 @@ async function createUser (req: express.Request, res: express.Response) { account: { id: account.id } - } - }).end() -} - -async function registerUser (req: express.Request, res: express.Response) { - const body: UserRegister = req.body - - const userToCreate = new UserModel({ - username: body.username, - password: body.password, - email: body.email, - nsfwPolicy: CONFIG.INSTANCE.DEFAULT_NSFW_POLICY, - autoPlayVideo: true, - role: UserRole.USER, - videoQuota: CONFIG.USER.VIDEO_QUOTA, - videoQuotaDaily: CONFIG.USER.VIDEO_QUOTA_DAILY, - emailVerified: CONFIG.SIGNUP.REQUIRES_EMAIL_VERIFICATION ? false : null - }) - - const { user, account, videoChannel } = await createUserAccountAndChannelAndPlaylist({ - userToCreate: userToCreate, - userDisplayName: body.displayName || undefined, - channelNames: body.channel + } as UserCreateResult }) - - auditLogger.create(body.username, new UserAuditView(user.toFormattedJSON())) - logger.info('User %s with its channel and account registered.', body.username) - - if (CONFIG.SIGNUP.REQUIRES_EMAIL_VERIFICATION) { - await sendVerifyUserEmail(user) - } - - Notifier.Instance.notifyOnNewUserRegistration(user) - - Hooks.runAction('action:api.user.registered', { body, user, account, videoChannel }) - - return res.type('json').status(204).end() } async function unblockUser (req: express.Request, res: express.Response) { @@ -268,9 +189,9 @@ async function unblockUser (req: express.Request, res: express.Response) { await changeUserBlock(res, user, false) - Hooks.runAction('action:api.user.unblocked', { user }) + Hooks.runAction('action:api.user.unblocked', { user, req, res }) - return res.status(204).end() + return res.status(HttpStatusCode.NO_CONTENT_204).end() } async function blockUser (req: express.Request, res: express.Response) { @@ -279,9 +200,9 @@ async function blockUser (req: express.Request, res: express.Response) { await changeUserBlock(res, user, true, reason) - Hooks.runAction('action:api.user.blocked', { user }) + Hooks.runAction('action:api.user.blocked', { user, req, res }) - return res.status(204).end() + return res.status(HttpStatusCode.NO_CONTENT_204).end() } function getUser (req: express.Request, res: express.Response) { @@ -295,7 +216,13 @@ async function autocompleteUsers (req: express.Request, res: express.Response) { } async function listUsers (req: express.Request, res: express.Response) { - const resultList = await UserModel.listForApi(req.query.start, req.query.count, req.query.sort, req.query.search) + const resultList = await UserModel.listForAdminApi({ + start: req.query.start, + count: req.query.count, + sort: req.query.sort, + search: req.query.search, + blocked: req.query.blocked + }) return res.json(getFormattedObjects(resultList.data, resultList.total, { withAdminFlags: true })) } @@ -303,13 +230,16 @@ async function listUsers (req: express.Request, res: express.Response) { async function removeUser (req: express.Request, res: express.Response) { const user = res.locals.user - await user.destroy() - auditLogger.delete(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON())) - Hooks.runAction('action:api.user.deleted', { user }) + await sequelizeTypescript.transaction(async t => { + // Use a transaction to avoid inconsistencies with hooks (account/channel deletion & federation) + await user.destroy({ transaction: t }) + }) + + Hooks.runAction('action:api.user.deleted', { user, req, res }) - return res.sendStatus(204) + return res.status(HttpStatusCode.NO_CONTENT_204).end() } async function updateUser (req: express.Request, res: express.Response) { @@ -318,26 +248,33 @@ async function updateUser (req: express.Request, res: express.Response) { const oldUserAuditView = new UserAuditView(userToUpdate.toFormattedJSON()) const roleChanged = body.role !== undefined && body.role !== userToUpdate.role - if (body.password !== undefined) userToUpdate.password = body.password - if (body.email !== undefined) userToUpdate.email = body.email - if (body.emailVerified !== undefined) userToUpdate.emailVerified = body.emailVerified - if (body.videoQuota !== undefined) userToUpdate.videoQuota = body.videoQuota - if (body.videoQuotaDaily !== undefined) userToUpdate.videoQuotaDaily = body.videoQuotaDaily - if (body.role !== undefined) userToUpdate.role = body.role - if (body.adminFlags !== undefined) userToUpdate.adminFlags = body.adminFlags + const keysToUpdate: (keyof UserUpdate)[] = [ + 'password', + 'email', + 'emailVerified', + 'videoQuota', + 'videoQuotaDaily', + 'role', + 'adminFlags', + 'pluginAuth' + ] + + for (const key of keysToUpdate) { + if (body[key] !== undefined) userToUpdate.set(key, body[key]) + } const user = await userToUpdate.save() // Destroy user token to refresh rights - if (roleChanged || body.password !== undefined) await deleteUserToken(userToUpdate.id) + if (roleChanged || body.password !== undefined) await OAuthTokenModel.deleteUserToken(userToUpdate.id) auditLogger.update(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON()), oldUserAuditView) - Hooks.runAction('action:api.user.updated', { user }) + Hooks.runAction('action:api.user.updated', { user, req, res }) // Don't need to send this update to followers, these attributes are not federated - return res.sendStatus(204) + return res.status(HttpStatusCode.NO_CONTENT_204).end() } async function askResetUserPassword (req: express.Request, res: express.Response) { @@ -345,9 +282,9 @@ async function askResetUserPassword (req: express.Request, res: express.Response const verificationString = await Redis.Instance.setResetPasswordVerificationString(user.id) const url = WEBSERVER.URL + '/reset-password?userId=' + user.id + '&verificationString=' + verificationString - await Emailer.Instance.addPasswordResetEmailJob(user.email, url) + Emailer.Instance.addPasswordResetEmailJob(user.username, user.email, url) - return res.status(204).end() + return res.status(HttpStatusCode.NO_CONTENT_204).end() } async function resetUserPassword (req: express.Request, res: express.Response) { @@ -355,36 +292,9 @@ async function resetUserPassword (req: express.Request, res: express.Response) { user.password = req.body.password await user.save() + await Redis.Instance.removePasswordVerificationString(user.id) - return res.status(204).end() -} - -async function reSendVerifyUserEmail (req: express.Request, res: express.Response) { - const user = res.locals.user - - await sendVerifyUserEmail(user) - - return res.status(204).end() -} - -async function verifyUserEmail (req: express.Request, res: express.Response) { - const user = res.locals.user - user.emailVerified = true - - if (req.body.isPendingEmail === true) { - user.email = user.pendingEmail - user.pendingEmail = null - } - - await user.save() - - return res.status(204).end() -} - -function tokenSuccess (req: express.Request) { - const username = req.body.username - - Hooks.runAction('action:api.user.oauth2-got-token', { username, ip: req.ip }) + return res.status(HttpStatusCode.NO_CONTENT_204).end() } async function changeUserBlock (res: express.Response, user: MUserAccountDefault, block: boolean, reason?: string) { @@ -394,12 +304,12 @@ async function changeUserBlock (res: express.Response, user: MUserAccountDefault user.blockedReason = reason || null await sequelizeTypescript.transaction(async t => { - await deleteUserToken(user.id, t) + await OAuthTokenModel.deleteUserToken(user.id, t) await user.save({ transaction: t }) }) - await Emailer.Instance.addUserBlockJob(user, block, reason) + Emailer.Instance.addUserBlockJob(user, block, reason) auditLogger.update(getAuditIdFromRes(res), new UserAuditView(user.toFormattedJSON()), oldUserAuditView) }