ActivityPub-federated video streaming platform using P2P directly in your web browser
Refactor account/channel manage checks
Chocobozzz334ad174a999
diff --git a/packages/tests/src/api/check-params/videos.ts b/packages/tests/src/api/check-params/videos.tsindex 1897406c3a..cb64f13e0d 100644--- a/packages/tests/src/api/check-params/videos.ts+++ b/packages/tests/src/api/check-params/videos.ts@@ -140,10 +140,11 @@ describe('Test videos API validator', function () {}{- const { total, data } = await server.videos.listMyVideos({ token: userAccessToken, channelId: server.store.channel.id })-- expect(total).to.equal(0)- expect(data).to.have.lengthOf(0)+ await server.videos.listMyVideos({+ token: userAccessToken,+ channelId: server.store.channel.id,+ expectedStatus: HttpStatusCode.FORBIDDEN_403+ })}}diff --git a/server/core/controllers/activitypub/client.ts b/server/core/controllers/activitypub/client.tsindex 48bf51129a..03ef124d5e 100644--- a/server/core/controllers/activitypub/client.ts+++ b/server/core/controllers/activitypub/client.ts@@ -37,14 +37,13 @@ import {import {activityPubRateLimiter,asyncMiddleware,- ensureIsLocalChannel,executeIfActivityPub,- localAccountValidator,- videoChannelsNameWithHostValidator,+ videoChannelsHandleValidatorFactory,videosCustomGetValidator,videosShareValidator} from '../../middlewares/index.js'import {+ accountHandleGetValidatorFactory,getAccountVideoRateValidatorFactory,getVideoLocalViewerValidator,videoCommentGetValidator@@ -68,35 +67,40 @@ activityPubClientRouter.get([ '/accounts?/:name', '/accounts?/:name/video-channels', '/a/:name', '/a/:name/video-channels' ],executeIfActivityPub,activityPubRateLimiter,- asyncMiddleware(localAccountValidator),+ asyncMiddleware(accountHandleGetValidatorFactory({ checkIsLocal: true, checkManage: false })),asyncMiddleware(accountController))-activityPubClientRouter.get('/accounts?/:name/followers',+activityPubClientRouter.get(+ '/accounts?/:name/followers',executeIfActivityPub,activityPubRateLimiter,- asyncMiddleware(localAccountValidator),+ asyncMiddleware(accountHandleGetValidatorFactory({ checkIsLocal: true, checkManage: false })),asyncMiddleware(accountFollowersController))-activityPubClientRouter.get('/accounts?/:name/following',+activityPubClientRouter.get(+ '/accounts?/:name/following',executeIfActivityPub,activityPubRateLimiter,- asyncMiddleware(localAccountValidator),+ asyncMiddleware(accountHandleGetValidatorFactory({ checkIsLocal: true, checkManage: false })),asyncMiddleware(accountFollowingController))-activityPubClientRouter.get('/accounts?/:name/playlists',+activityPubClientRouter.get(+ '/accounts?/:name/playlists',executeIfActivityPub,activityPubRateLimiter,- asyncMiddleware(localAccountValidator),+ asyncMiddleware(accountHandleGetValidatorFactory({ checkIsLocal: true, checkManage: false })),asyncMiddleware(accountPlaylistsController))-activityPubClientRouter.get('/accounts?/:name/likes/:videoId',+activityPubClientRouter.get(+ '/accounts?/:name/likes/:videoId',executeIfActivityPub,activityPubRateLimiter,cacheRoute(ROUTE_CACHE_LIFETIME.ACTIVITY_PUB.VIDEOS),asyncMiddleware(getAccountVideoRateValidatorFactory('like')),asyncMiddleware(getAccountVideoRateFactory('like')))-activityPubClientRouter.get('/accounts?/:name/dislikes/:videoId',+activityPubClientRouter.get(+ '/accounts?/:name/dislikes/:videoId',executeIfActivityPub,activityPubRateLimiter,cacheRoute(ROUTE_CACHE_LIFETIME.ACTIVITY_PUB.VIDEOS),@@ -106,19 +110,22 @@ activityPubClientRouter.get('/accounts?/:name/dislikes/:videoId',// ----------------------------------------------------------------------------activityPubClientRouter.get('/videos/watch/:id/comments',+activityPubClientRouter.get(+ '/videos/watch/:id/comments',executeIfActivityPub,activityPubRateLimiter,asyncMiddleware(videosCustomGetValidator('only-video-and-blacklist')),asyncMiddleware(videoCommentsController))-activityPubClientRouter.get('/videos/watch/:videoId/comments/:commentId/approve-reply',+activityPubClientRouter.get(+ '/videos/watch/:videoId/comments/:commentId/approve-reply',executeIfActivityPub,activityPubRateLimiter,asyncMiddleware(videoCommentGetValidator),asyncMiddleware(videoCommentApprovedController))-activityPubClientRouter.get('/videos/watch/:videoId/comments/:commentId/activity',+activityPubClientRouter.get(+ '/videos/watch/:videoId/comments/:commentId/activity',executeIfActivityPub,activityPubRateLimiter,asyncMiddleware(videoCommentGetValidator),@@ -142,31 +149,36 @@ activityPubClientRouter.get(asyncMiddleware(videosCustomGetValidator('all')),asyncMiddleware(videoController))-activityPubClientRouter.get('/videos/watch/:id/activity',+activityPubClientRouter.get(+ '/videos/watch/:id/activity',executeIfActivityPub,activityPubRateLimiter,asyncMiddleware(videosCustomGetValidator('all')),asyncMiddleware(videoController))-activityPubClientRouter.get('/videos/watch/:id/announces',+activityPubClientRouter.get(+ '/videos/watch/:id/announces',executeIfActivityPub,activityPubRateLimiter,asyncMiddleware(videosCustomGetValidator('only-video-and-blacklist')),asyncMiddleware(videoAnnouncesController))-activityPubClientRouter.get('/videos/watch/:id/announces/:actorId',+activityPubClientRouter.get(+ '/videos/watch/:id/announces/:actorId',executeIfActivityPub,activityPubRateLimiter,asyncMiddleware(videosShareValidator),asyncMiddleware(videoAnnounceController))-activityPubClientRouter.get('/videos/watch/:id/likes',+activityPubClientRouter.get(+ '/videos/watch/:id/likes',executeIfActivityPub,activityPubRateLimiter,asyncMiddleware(videosCustomGetValidator('only-video-and-blacklist')),asyncMiddleware(videoLikesController))-activityPubClientRouter.get('/videos/watch/:id/dislikes',+activityPubClientRouter.get(+ '/videos/watch/:id/dislikes',executeIfActivityPub,activityPubRateLimiter,asyncMiddleware(videosCustomGetValidator('only-video-and-blacklist')),@@ -183,7 +195,8 @@ InternalEventEmitter.Instance.on('chapters-updated', ({ video }) => {chaptersApiCache.clearGroupSafe(buildAPVideoChaptersGroupsCache({ videoId: video.uuid }))})-activityPubClientRouter.get('/videos/watch/:id/chapters',+activityPubClientRouter.get(+ '/videos/watch/:id/chapters',executeIfActivityPub,activityPubRateLimiter,apVideoChaptersSetCacheKey,@@ -198,33 +211,33 @@ activityPubClientRouter.get([ '/video-channels/:nameWithHost', '/video-channels/:nameWithHost/videos', '/c/:nameWithHost', '/c/:nameWithHost/videos' ],executeIfActivityPub,activityPubRateLimiter,- asyncMiddleware(videoChannelsNameWithHostValidator),- ensureIsLocalChannel,+ asyncMiddleware(videoChannelsHandleValidatorFactory({ checkIsLocal: true, checkManage: false })),asyncMiddleware(videoChannelController))-activityPubClientRouter.get('/video-channels/:nameWithHost/followers',+activityPubClientRouter.get(+ '/video-channels/:nameWithHost/followers',executeIfActivityPub,activityPubRateLimiter,- asyncMiddleware(videoChannelsNameWithHostValidator),- ensureIsLocalChannel,+ asyncMiddleware(videoChannelsHandleValidatorFactory({ checkIsLocal: true, checkManage: false })),asyncMiddleware(videoChannelFollowersController))-activityPubClientRouter.get('/video-channels/:nameWithHost/following',+activityPubClientRouter.get(+ '/video-channels/:nameWithHost/following',executeIfActivityPub,activityPubRateLimiter,- asyncMiddleware(videoChannelsNameWithHostValidator),- ensureIsLocalChannel,+ asyncMiddleware(videoChannelsHandleValidatorFactory({ checkIsLocal: true, checkManage: false })),asyncMiddleware(videoChannelFollowingController))-activityPubClientRouter.get('/video-channels/:nameWithHost/playlists',+activityPubClientRouter.get(+ '/video-channels/:nameWithHost/playlists',executeIfActivityPub,activityPubRateLimiter,- asyncMiddleware(videoChannelsNameWithHostValidator),- ensureIsLocalChannel,+ asyncMiddleware(videoChannelsHandleValidatorFactory({ checkIsLocal: true, checkManage: false })),asyncMiddleware(videoChannelPlaylistsController))-activityPubClientRouter.get('/redundancy/streaming-playlists/:streamingPlaylistType/:videoId',+activityPubClientRouter.get(+ '/redundancy/streaming-playlists/:streamingPlaylistType/:videoId',executeIfActivityPub,activityPubRateLimiter,asyncMiddleware(videoPlaylistRedundancyGetValidator),@@ -238,14 +251,16 @@ activityPubClientRouter.get(asyncMiddleware(videoPlaylistsGetValidator('all')),asyncMiddleware(videoPlaylistController))-activityPubClientRouter.get('/video-playlists/:playlistId/videos/:playlistElementId',+activityPubClientRouter.get(+ '/video-playlists/:playlistId/videos/:playlistElementId',executeIfActivityPub,activityPubRateLimiter,asyncMiddleware(videoPlaylistElementAPGetValidator),asyncMiddleware(videoPlaylistElementController))-activityPubClientRouter.get('/videos/local-viewer/:localViewerId',+activityPubClientRouter.get(+ '/videos/local-viewer/:localViewerId',executeIfActivityPub,activityPubRateLimiter,asyncMiddleware(getVideoLocalViewerValidator),diff --git a/server/core/controllers/activitypub/inbox.ts b/server/core/controllers/activitypub/inbox.tsindex 945d22547c..59ae140f9c 100644--- a/server/core/controllers/activitypub/inbox.ts+++ b/server/core/controllers/activitypub/inbox.ts@@ -1,22 +1,22 @@-import express from 'express'import { Activity, ActivityPubCollection, ActivityPubOrderedCollection, HttpStatusCode, RootActivity } from '@peertube/peertube-models'import { InboxManager } from '@server/lib/activitypub/inbox-manager.js'+import express from 'express'import { isActivityValid } from '../../helpers/custom-validators/activitypub/activity.js'import { logger } from '../../helpers/logger.js'import {+ accountHandleGetValidatorFactory,activityPubRateLimiter,asyncMiddleware,checkSignature,- ensureIsLocalChannel,- localAccountValidator,signatureValidator,- videoChannelsNameWithHostValidator+ videoChannelsHandleValidatorFactory} from '../../middlewares/index.js'import { activityPubValidator } from '../../middlewares/validators/activitypub/activity.js'const inboxRouter = express.Router()-inboxRouter.post('/inbox',+inboxRouter.post(+ '/inbox',activityPubRateLimiter,signatureValidator,asyncMiddleware(checkSignature),@@ -24,21 +24,22 @@ inboxRouter.post('/inbox',inboxController)-inboxRouter.post('/accounts/:name/inbox',+inboxRouter.post(+ '/accounts/:name/inbox',activityPubRateLimiter,signatureValidator,asyncMiddleware(checkSignature),- asyncMiddleware(localAccountValidator),+ asyncMiddleware(accountHandleGetValidatorFactory({ checkIsLocal: true, checkManage: false })),asyncMiddleware(activityPubValidator),inboxController)-inboxRouter.post('/video-channels/:nameWithHost/inbox',+inboxRouter.post(+ '/video-channels/:nameWithHost/inbox',activityPubRateLimiter,signatureValidator,asyncMiddleware(checkSignature),- asyncMiddleware(videoChannelsNameWithHostValidator),- ensureIsLocalChannel,+ asyncMiddleware(videoChannelsHandleValidatorFactory({ checkIsLocal: true, checkManage: false })),asyncMiddleware(activityPubValidator),inboxController)diff --git a/server/core/controllers/activitypub/outbox.ts b/server/core/controllers/activitypub/outbox.tsindex 7714f8400b..ac9e8d1552 100644--- a/server/core/controllers/activitypub/outbox.ts+++ b/server/core/controllers/activitypub/outbox.ts@@ -1,18 +1,17 @@-import express from 'express'import { Activity, VideoPrivacy } from '@peertube/peertube-models'import { activityPubContextify } from '@server/helpers/activity-pub-utils.js'import { activityPubCollectionPagination } from '@server/lib/activitypub/collection.js'import { getContextFilter } from '@server/lib/activitypub/context.js'import { MActorLight } from '@server/types/models/index.js'+import express from 'express'import { logger } from '../../helpers/logger.js'import { buildAudience } from '../../lib/activitypub/audience.js'import { buildAnnounceActivity, buildCreateActivity } from '../../lib/activitypub/send/index.js'import {+ accountHandleGetValidatorFactory,activityPubRateLimiter,asyncMiddleware,- ensureIsLocalChannel,- localAccountValidator,- videoChannelsNameWithHostValidator+ videoChannelsHandleValidatorFactory} from '../../middlewares/index.js'import { apPaginationValidator } from '../../middlewares/validators/activitypub/index.js'import { VideoModel } from '../../models/video/video.js'@@ -20,18 +19,19 @@ import { activityPubResponse } from './utils.js'const outboxRouter = express.Router()-outboxRouter.get('/accounts/:name/outbox',+outboxRouter.get(+ '/accounts/:name/outbox',activityPubRateLimiter,apPaginationValidator,- localAccountValidator,+ accountHandleGetValidatorFactory({ checkIsLocal: true, checkManage: false }),asyncMiddleware(outboxController))-outboxRouter.get('/video-channels/:nameWithHost/outbox',+outboxRouter.get(+ '/video-channels/:nameWithHost/outbox',activityPubRateLimiter,apPaginationValidator,- asyncMiddleware(videoChannelsNameWithHostValidator),- ensureIsLocalChannel,+ asyncMiddleware(videoChannelsHandleValidatorFactory({ checkIsLocal: true, checkManage: false })),asyncMiddleware(outboxController))diff --git a/server/core/controllers/api/accounts.ts b/server/core/controllers/api/accounts.tsindex ae32742467..44de7cd7f4 100644--- a/server/core/controllers/api/accounts.ts+++ b/server/core/controllers/api/accounts.ts@@ -1,8 +1,8 @@-import express from 'express'import { pickCommonVideoQuery } from '@server/helpers/query.js'import { ActorFollowModel } from '@server/models/actor/actor-follow.js'import { getServerActor } from '@server/models/application/application.js'import { VideoChannelSyncModel } from '@server/models/video/video-channel-sync.js'+import express from 'express'import { buildNSFWFilter, getCountVideos, isUserAbleToSearchRemoteURI } from '../../helpers/express-utils.js'import { getFormattedObjects } from '../../helpers/utils.js'import { JobQueue } from '../../lib/job-queue/index.js'@@ -22,29 +22,28 @@ import {videoRatingValidator} from '../../middlewares/index.js'import {- accountNameWithHostGetValidator,+ accountHandleGetValidatorFactory,accountsFollowersSortValidator,accountsSortValidator,- ensureAuthUserOwnsAccountValidator,- ensureCanManageChannelOrAccount,videoChannelsSortValidator,videoChannelStatsValidator,videoChannelSyncsSortValidator,videosSortValidator} from '../../middlewares/validators/index.js'import { commonVideoPlaylistFiltersValidator, videoPlaylistsSearchValidator } from '../../middlewares/validators/videos/video-playlists.js'-import { AccountModel } from '../../models/account/account.js'import { AccountVideoRateModel } from '../../models/account/account-video-rate.js'+import { AccountModel } from '../../models/account/account.js'import { guessAdditionalAttributesFromQuery } from '../../models/video/formatter/index.js'-import { VideoModel } from '../../models/video/video.js'import { VideoChannelModel } from '../../models/video/video-channel.js'import { VideoPlaylistModel } from '../../models/video/video-playlist.js'+import { VideoModel } from '../../models/video/video.js'const accountsRouter = express.Router()accountsRouter.use(apiRateLimiter)-accountsRouter.get('/',+accountsRouter.get(+ '/',paginationValidator,accountsSortValidator,setDefaultSort,@@ -52,13 +51,15 @@ accountsRouter.get('/',asyncMiddleware(listAccounts))-accountsRouter.get('/:accountName',- asyncMiddleware(accountNameWithHostGetValidator),+accountsRouter.get(+ '/:accountName',+ asyncMiddleware(accountHandleGetValidatorFactory({ checkIsLocal: false, checkManage: false })),getAccount)-accountsRouter.get('/:accountName/videos',- asyncMiddleware(accountNameWithHostGetValidator),+accountsRouter.get(+ '/:accountName/videos',+ asyncMiddleware(accountHandleGetValidatorFactory({ checkIsLocal: false, checkManage: false })),paginationValidator,videosSortValidator,setDefaultVideosSort,@@ -68,8 +69,9 @@ accountsRouter.get('/:accountName/videos',asyncMiddleware(listAccountVideos))-accountsRouter.get('/:accountName/video-channels',- asyncMiddleware(accountNameWithHostGetValidator),+accountsRouter.get(+ '/:accountName/video-channels',+ asyncMiddleware(accountHandleGetValidatorFactory({ checkIsLocal: false, checkManage: false })),videoChannelStatsValidator,paginationValidator,videoChannelsSortValidator,@@ -78,20 +80,10 @@ accountsRouter.get('/:accountName/video-channels',asyncMiddleware(listAccountChannels))-accountsRouter.get('/:accountName/video-channel-syncs',- authenticate,- asyncMiddleware(accountNameWithHostGetValidator),- ensureCanManageChannelOrAccount,- paginationValidator,- videoChannelSyncsSortValidator,- setDefaultSort,- setDefaultPagination,- asyncMiddleware(listAccountChannelsSync)-)--accountsRouter.get('/:accountName/video-playlists',+accountsRouter.get(+ '/:accountName/video-playlists',optionalAuthenticate,- asyncMiddleware(accountNameWithHostGetValidator),+ asyncMiddleware(accountHandleGetValidatorFactory({ checkIsLocal: false, checkManage: false })),paginationValidator,videoPlaylistsSortValidator,setDefaultSort,@@ -101,10 +93,21 @@ accountsRouter.get('/:accountName/video-playlists',asyncMiddleware(listAccountPlaylists))-accountsRouter.get('/:accountName/ratings',+accountsRouter.get(+ '/:accountName/video-channel-syncs',+ authenticate,+ asyncMiddleware(accountHandleGetValidatorFactory({ checkIsLocal: true, checkManage: true })),+ paginationValidator,+ videoChannelSyncsSortValidator,+ setDefaultSort,+ setDefaultPagination,+ asyncMiddleware(listAccountChannelsSync)+)++accountsRouter.get(+ '/:accountName/ratings',authenticate,- asyncMiddleware(accountNameWithHostGetValidator),- ensureAuthUserOwnsAccountValidator,+ asyncMiddleware(accountHandleGetValidatorFactory({ checkIsLocal: true, checkManage: true })),paginationValidator,videoRatesSortValidator,setDefaultSort,@@ -113,10 +116,10 @@ accountsRouter.get('/:accountName/ratings',asyncMiddleware(listAccountRatings))-accountsRouter.get('/:accountName/followers',+accountsRouter.get(+ '/:accountName/followers',authenticate,- asyncMiddleware(accountNameWithHostGetValidator),- ensureAuthUserOwnsAccountValidator,+ asyncMiddleware(accountHandleGetValidatorFactory({ checkIsLocal: true, checkManage: true })),paginationValidator,accountsFollowersSortValidator,setDefaultSort,diff --git a/server/core/controllers/api/users/index.ts b/server/core/controllers/api/users/index.tsindex 72da8b758c..045c093b13 100644--- a/server/core/controllers/api/users/index.ts+++ b/server/core/controllers/api/users/index.ts@@ -1,10 +1,10 @@-import express from 'express'+import { pick } from '@peertube/peertube-core-utils'+import { HttpStatusCode, UserCreate, UserCreateResult, UserRight, UserUpdate } from '@peertube/peertube-models'import { tokensRouter } from '@server/controllers/api/users/token.js'import { Hooks } from '@server/lib/plugins/hooks.js'import { OAuthTokenModel } from '@server/models/oauth/oauth-token.js'import { MUserAccountDefault } from '@server/types/models/index.js'-import { pick } from '@peertube/peertube-core-utils'-import { HttpStatusCode, UserCreate, UserCreateResult, UserRight, UserUpdate } from '@peertube/peertube-models'+import express from 'express'import { auditLoggerFactory, getAuditIdFromRes, UserAuditView } from '../../../helpers/audit-logger.js'import { logger, loggerTagsFactory } from '../../../helpers/logger.js'import { generateRandomString, getFormattedObjects } from '../../../helpers/utils.js'@@ -31,9 +31,8 @@ import {usersUpdateValidator} from '../../../middlewares/index.js'import {- ensureCanModerateUser,usersAskResetPasswordValidator,- usersBlockingValidator,+ usersBlockToggleValidator,usersResetPasswordValidator} from '../../../middlewares/validators/index.js'import { UserModel } from '../../../models/user/user.js'@@ -71,12 +70,10 @@ usersRouter.use('/', myVideoPlaylistsRouter)usersRouter.use('/', myAbusesRouter)usersRouter.use('/', meRouter)-usersRouter.get('/autocomplete',- userAutocompleteValidator,- asyncMiddleware(autocompleteUsers)-)+usersRouter.get('/autocomplete', userAutocompleteValidator, asyncMiddleware(autocompleteUsers))-usersRouter.get('/',+usersRouter.get(+ '/',authenticate,ensureUserHasRight(UserRight.MANAGE_USERS),paginationValidator,@@ -87,60 +84,50 @@ usersRouter.get('/',asyncMiddleware(listUsers))-usersRouter.post('/:id/block',+usersRouter.post(+ '/:id/block',authenticate,ensureUserHasRight(UserRight.MANAGE_USERS),- asyncMiddleware(usersBlockingValidator),- ensureCanModerateUser,+ asyncMiddleware(usersBlockToggleValidator),asyncMiddleware(blockUser))-usersRouter.post('/:id/unblock',+usersRouter.post(+ '/:id/unblock',authenticate,ensureUserHasRight(UserRight.MANAGE_USERS),- asyncMiddleware(usersBlockingValidator),- ensureCanModerateUser,+ asyncMiddleware(usersBlockToggleValidator),asyncMiddleware(unblockUser))-usersRouter.get('/:id',- authenticate,- ensureUserHasRight(UserRight.MANAGE_USERS),- asyncMiddleware(usersGetValidator),- getUser-)+usersRouter.get('/:id', authenticate, ensureUserHasRight(UserRight.MANAGE_USERS), asyncMiddleware(usersGetValidator), getUser)-usersRouter.post('/',+usersRouter.post(+ '/',authenticate,ensureUserHasRight(UserRight.MANAGE_USERS),asyncMiddleware(usersAddValidator),asyncRetryTransactionMiddleware(createUser))-usersRouter.put('/:id',+usersRouter.put(+ '/:id',authenticate,ensureUserHasRight(UserRight.MANAGE_USERS),asyncMiddleware(usersUpdateValidator),- ensureCanModerateUser,asyncMiddleware(updateUser))-usersRouter.delete('/:id',+usersRouter.delete(+ '/:id',authenticate,ensureUserHasRight(UserRight.MANAGE_USERS),asyncMiddleware(usersRemoveValidator),- ensureCanModerateUser,asyncMiddleware(removeUser))-usersRouter.post('/ask-reset-password',- asyncMiddleware(usersAskResetPasswordValidator),- asyncMiddleware(askResetUserPassword)-)+usersRouter.post('/ask-reset-password', asyncMiddleware(usersAskResetPasswordValidator), asyncMiddleware(askResetUserPassword))-usersRouter.post('/:id/reset-password',- asyncMiddleware(usersResetPasswordValidator),- asyncMiddleware(resetUserPassword)-)+usersRouter.post('/:id/reset-password', asyncMiddleware(usersResetPasswordValidator), asyncMiddleware(resetUserPassword))// ---------------------------------------------------------------------------diff --git a/server/core/controllers/api/video-channel-sync.ts b/server/core/controllers/api/video-channel-sync.tsindex fb1f05f7c4..416439edbd 100644--- a/server/core/controllers/api/video-channel-sync.ts+++ b/server/core/controllers/api/video-channel-sync.ts@@ -1,4 +1,4 @@-import express from 'express'+import { HttpStatusCode, VideoChannelSyncState } from '@peertube/peertube-models'import { auditLoggerFactory, getAuditIdFromRes, VideoChannelSyncAuditView } from '@server/helpers/audit-logger.js'import { logger } from '@server/helpers/logger.js'import {@@ -6,32 +6,31 @@ import {asyncMiddleware,asyncRetryTransactionMiddleware,authenticate,- ensureCanManageChannelOrAccount,ensureSyncExists,ensureSyncIsEnabled,videoChannelSyncValidator} from '@server/middlewares/index.js'import { VideoChannelSyncModel } from '@server/models/video/video-channel-sync.js'import { MChannelSyncFormattable } from '@server/types/models/index.js'-import { HttpStatusCode, VideoChannelSyncState } from '@peertube/peertube-models'+import express from 'express'const videoChannelSyncRouter = express.Router()const auditLogger = auditLoggerFactory('channel-syncs')videoChannelSyncRouter.use(apiRateLimiter)-videoChannelSyncRouter.post('/',+videoChannelSyncRouter.post(+ '/',authenticate,ensureSyncIsEnabled,asyncMiddleware(videoChannelSyncValidator),- ensureCanManageChannelOrAccount,asyncRetryTransactionMiddleware(createVideoChannelSync))-videoChannelSyncRouter.delete('/:id',+videoChannelSyncRouter.delete(+ '/:id',authenticate,asyncMiddleware(ensureSyncExists),- ensureCanManageChannelOrAccount,asyncRetryTransactionMiddleware(removeVideoChannelSync))diff --git a/server/core/controllers/api/video-channel.ts b/server/core/controllers/api/video-channel.tsindex 86a5c61934..0f1379dc1a 100644--- a/server/core/controllers/api/video-channel.ts+++ b/server/core/controllers/api/video-channel.ts@@ -1,4 +1,3 @@-import express from 'express'import {ActorImageType,HttpStatusCode,@@ -11,6 +10,7 @@ import { Hooks } from '@server/lib/plugins/hooks.js'import { ActorFollowModel } from '@server/models/actor/actor-follow.js'import { getServerActor } from '@server/models/application/application.js'import { MChannelBannerAccountDefault } from '@server/types/models/index.js'+import express from 'express'import { auditLoggerFactory, getAuditIdFromRes, VideoChannelAuditView } from '../../helpers/audit-logger.js'import { resetSequelizeInstance } from '../../helpers/database-utils.js'import { buildNSFWFilter, createReqFiles, getCountVideos, isUserAbleToSearchRemoteURI } from '../../helpers/express-utils.js'@@ -28,7 +28,6 @@ import {asyncRetryTransactionMiddleware,authenticate,commonVideosFiltersValidator,- ensureCanManageChannelOrAccount,optionalAuthenticate,paginationValidator,setDefaultPagination,@@ -43,11 +42,10 @@ import {import { updateAvatarValidator, updateBannerValidator } from '../../middlewares/validators/actor-image.js'import {ensureChannelOwnerCanUpload,- ensureIsLocalChannel,videoChannelImportVideosValidator,videoChannelsFollowersSortValidator,+ videoChannelsHandleValidatorFactory,videoChannelsListValidator,- videoChannelsNameWithHostValidator,videosSortValidator} from '../../middlewares/validators/index.js'import { commonVideoPlaylistFiltersValidator } from '../../middlewares/validators/videos/video-playlists.js'@@ -65,7 +63,8 @@ const videoChannelRouter = express.Router()videoChannelRouter.use(apiRateLimiter)-videoChannelRouter.get('/',+videoChannelRouter.get(+ '/',paginationValidator,videoChannelsSortValidator,setDefaultSort,@@ -74,74 +73,66 @@ videoChannelRouter.get('/',asyncMiddleware(listVideoChannels))-videoChannelRouter.post('/',- authenticate,- asyncMiddleware(videoChannelsAddValidator),- asyncRetryTransactionMiddleware(createVideoChannel)-)+videoChannelRouter.post('/', authenticate, asyncMiddleware(videoChannelsAddValidator), asyncRetryTransactionMiddleware(createVideoChannel))-videoChannelRouter.post('/:nameWithHost/avatar/pick',+videoChannelRouter.post(+ '/:nameWithHost/avatar/pick',authenticate,reqAvatarFile,- asyncMiddleware(videoChannelsNameWithHostValidator),- ensureIsLocalChannel,- ensureCanManageChannelOrAccount,+ asyncMiddleware(videoChannelsHandleValidatorFactory({ checkIsLocal: true, checkManage: true })),updateAvatarValidator,asyncMiddleware(updateVideoChannelAvatar))-videoChannelRouter.post('/:nameWithHost/banner/pick',+videoChannelRouter.post(+ '/:nameWithHost/banner/pick',authenticate,reqBannerFile,- asyncMiddleware(videoChannelsNameWithHostValidator),- ensureIsLocalChannel,- ensureCanManageChannelOrAccount,+ asyncMiddleware(videoChannelsHandleValidatorFactory({ checkIsLocal: true, checkManage: true })),updateBannerValidator,asyncMiddleware(updateVideoChannelBanner))-videoChannelRouter.delete('/:nameWithHost/avatar',+videoChannelRouter.delete(+ '/:nameWithHost/avatar',authenticate,- asyncMiddleware(videoChannelsNameWithHostValidator),- ensureIsLocalChannel,- ensureCanManageChannelOrAccount,+ asyncMiddleware(videoChannelsHandleValidatorFactory({ checkIsLocal: true, checkManage: true })),asyncMiddleware(deleteVideoChannelAvatar))-videoChannelRouter.delete('/:nameWithHost/banner',+videoChannelRouter.delete(+ '/:nameWithHost/banner',authenticate,- asyncMiddleware(videoChannelsNameWithHostValidator),- ensureIsLocalChannel,- ensureCanManageChannelOrAccount,+ asyncMiddleware(videoChannelsHandleValidatorFactory({ checkIsLocal: true, checkManage: true })),asyncMiddleware(deleteVideoChannelBanner))-videoChannelRouter.put('/:nameWithHost',+videoChannelRouter.put(+ '/:nameWithHost',authenticate,- asyncMiddleware(videoChannelsNameWithHostValidator),- ensureIsLocalChannel,- ensureCanManageChannelOrAccount,+ asyncMiddleware(videoChannelsHandleValidatorFactory({ checkIsLocal: true, checkManage: true })),videoChannelsUpdateValidator,asyncRetryTransactionMiddleware(updateVideoChannel))-videoChannelRouter.delete('/:nameWithHost',+videoChannelRouter.delete(+ '/:nameWithHost',authenticate,- asyncMiddleware(videoChannelsNameWithHostValidator),- ensureIsLocalChannel,- ensureCanManageChannelOrAccount,+ asyncMiddleware(videoChannelsHandleValidatorFactory({ checkIsLocal: true, checkManage: true })),asyncMiddleware(videoChannelsRemoveValidator),asyncRetryTransactionMiddleware(removeVideoChannel))-videoChannelRouter.get('/:nameWithHost',- asyncMiddleware(videoChannelsNameWithHostValidator),+videoChannelRouter.get(+ '/:nameWithHost',+ asyncMiddleware(videoChannelsHandleValidatorFactory({ checkIsLocal: false, checkManage: false })),asyncMiddleware(getVideoChannel))-videoChannelRouter.get('/:nameWithHost/video-playlists',+videoChannelRouter.get(+ '/:nameWithHost/video-playlists',optionalAuthenticate,- asyncMiddleware(videoChannelsNameWithHostValidator),+ asyncMiddleware(videoChannelsHandleValidatorFactory({ checkIsLocal: false, checkManage: false })),paginationValidator,videoPlaylistsSortValidator,setDefaultSort,@@ -150,8 +141,9 @@ videoChannelRouter.get('/:nameWithHost/video-playlists',asyncMiddleware(listVideoChannelPlaylists))-videoChannelRouter.get('/:nameWithHost/videos',- asyncMiddleware(videoChannelsNameWithHostValidator),+videoChannelRouter.get(+ '/:nameWithHost/videos',+ asyncMiddleware(videoChannelsHandleValidatorFactory({ checkIsLocal: false, checkManage: false })),paginationValidator,videosSortValidator,setDefaultVideosSort,@@ -161,10 +153,10 @@ videoChannelRouter.get('/:nameWithHost/videos',asyncMiddleware(listVideoChannelVideos))-videoChannelRouter.get('/:nameWithHost/followers',+videoChannelRouter.get(+ '/:nameWithHost/followers',authenticate,- asyncMiddleware(videoChannelsNameWithHostValidator),- ensureCanManageChannelOrAccount,+ asyncMiddleware(videoChannelsHandleValidatorFactory({ checkIsLocal: false, checkManage: true })),paginationValidator,videoChannelsFollowersSortValidator,setDefaultSort,@@ -172,12 +164,11 @@ videoChannelRouter.get('/:nameWithHost/followers',asyncMiddleware(listVideoChannelFollowers))-videoChannelRouter.post('/:nameWithHost/import-videos',+videoChannelRouter.post(+ '/:nameWithHost/import-videos',authenticate,- asyncMiddleware(videoChannelsNameWithHostValidator),+ asyncMiddleware(videoChannelsHandleValidatorFactory({ checkIsLocal: true, checkManage: true })),asyncMiddleware(videoChannelImportVideosValidator),- ensureIsLocalChannel,- ensureCanManageChannelOrAccount,asyncMiddleware(ensureChannelOwnerCanUpload),asyncMiddleware(importVideosInChannel))diff --git a/server/core/controllers/services.ts b/server/core/controllers/services.tsindex bb107076dc..eb405f4058 100644--- a/server/core/controllers/services.ts+++ b/server/core/controllers/services.ts@@ -4,19 +4,15 @@ import { escapeHTML, forceNumber } from '@peertube/peertube-core-utils'import { MChannelSummary } from '@server/types/models/index.js'import { EMBED_SIZE, PREVIEWS_SIZE, THUMBNAILS_SIZE, WEBSERVER } from '../initializers/constants.js'import { apiRateLimiter, asyncMiddleware, oembedValidator } from '../middlewares/index.js'-import { accountNameWithHostGetValidator } from '../middlewares/validators/index.js'+import { accountHandleGetValidatorFactory } from '../middlewares/validators/index.js'const servicesRouter = express.Router()-servicesRouter.use('/oembed',- cors(),+servicesRouter.use('/oembed', cors(), apiRateLimiter, asyncMiddleware(oembedValidator), generateOEmbed)+servicesRouter.use(+ '/redirect/accounts/:accountName',apiRateLimiter,- asyncMiddleware(oembedValidator),- generateOEmbed-)-servicesRouter.use('/redirect/accounts/:accountName',- apiRateLimiter,- asyncMiddleware(accountNameWithHostGetValidator),+ asyncMiddleware(accountHandleGetValidatorFactory({ checkIsLocal: false, checkManage: false })),redirectToAccountUrl)diff --git a/server/core/lib/html/shared/actor-html.ts b/server/core/lib/html/shared/actor-html.tsindex 5d5b6ffd3f..7de5058dab 100644--- a/server/core/lib/html/shared/actor-html.ts+++ b/server/core/lib/html/shared/actor-html.ts@@ -23,7 +23,7 @@ export class ActorHtml {}static async getVideoChannelHTMLPage (nameWithHost: string, req: express.Request, res: express.Response) {- const videoChannel = await VideoChannelModel.loadByNameWithHostAndPopulateAccount(nameWithHost)+ const videoChannel = await VideoChannelModel.loadByHandleAndPopulateAccount(nameWithHost)return this.getAccountOrChannelHTMLPage({loader: () => Promise.resolve(videoChannel),@@ -36,7 +36,7 @@ export class ActorHtml {static async getActorHTMLPage (nameWithHost: string, req: express.Request, res: express.Response) {const [ account, channel ] = await Promise.all([AccountModel.loadByNameWithHost(nameWithHost),- VideoChannelModel.loadByNameWithHostAndPopulateAccount(nameWithHost)+ VideoChannelModel.loadByHandleAndPopulateAccount(nameWithHost)])return this.getAccountOrChannelHTMLPage({diff --git a/server/core/middlewares/validators/abuse.ts b/server/core/middlewares/validators/abuse.tsindex 48fe06f4cf..5fa0f2e000 100644--- a/server/core/middlewares/validators/abuse.ts+++ b/server/core/middlewares/validators/abuse.ts@@ -57,7 +57,7 @@ const abuseReportValidator = [const body: AbuseCreate = req.bodyif (body.video?.id && !await doesVideoExist(body.video.id, res)) return- if (body.account?.id && !await doesAccountIdExist(body.account.id, res)) return+ if (body.account?.id && !await doesAccountIdExist({ id: body.account.id, res, checkIsLocal: false, checkManage: false })) returnif (body.comment?.id && !await doesCommentIdExist(body.comment.id, res)) returnif (!body.video?.id && !body.account?.id && !body.comment?.id) {diff --git a/server/core/middlewares/validators/account.ts b/server/core/middlewares/validators/account.tsindex a8793752e9..89f69ae56b 100644--- a/server/core/middlewares/validators/account.ts+++ b/server/core/middlewares/validators/account.ts@@ -1,35 +1,31 @@+import { UserRight } from '@peertube/peertube-models'import express from 'express'import { param } from 'express-validator'-import { isAccountNameValid } from '../../helpers/custom-validators/accounts.js'-import { areValidationErrors, doesAccountNameWithHostExist, doesLocalAccountNameExist } from './shared/index.js'+import { areValidationErrors, checkUserCanManageAccount, doesAccountHandleExist } from './shared/index.js'-const localAccountValidator = [- param('name')- .custom(isAccountNameValid),+export const accountHandleGetValidatorFactory = (options: {+ checkManage: boolean+ checkIsLocal: boolean+}) => {+ const { checkManage, checkIsLocal } = options- async (req: express.Request, res: express.Response, next: express.NextFunction) => {- if (areValidationErrors(req, res)) return- if (!await doesLocalAccountNameExist(req.params.name, res)) return+ return [+ param('accountName')+ .exists(),- return next()- }-]+ async (req: express.Request, res: express.Response, next: express.NextFunction) => {+ if (areValidationErrors(req, res)) return+ if (!await doesAccountHandleExist({ handle: req.params.accountName, res, checkIsLocal, checkManage })) return-const accountNameWithHostGetValidator = [- param('accountName')- .exists(),+ if (options.checkManage) {+ const user = res.locals.oauth.token.User- async (req: express.Request, res: express.Response, next: express.NextFunction) => {- if (areValidationErrors(req, res)) return- if (!await doesAccountNameWithHostExist(req.params.accountName, res)) return+ if (!checkUserCanManageAccount({ account: res.locals.account, user, res, specialRight: UserRight.MANAGE_USERS })) {+ return false+ }+ }- return next()- }-]--// -----------------------------------------------------------------------------export {- localAccountValidator,- accountNameWithHostGetValidator+ return next()+ }+ ]}diff --git a/server/core/middlewares/validators/automatic-tags.ts b/server/core/middlewares/validators/automatic-tags.tsindex 378fa8d5d3..9510ae0f26 100644--- a/server/core/middlewares/validators/automatic-tags.ts+++ b/server/core/middlewares/validators/automatic-tags.ts@@ -3,8 +3,7 @@ import { isStringArray } from '@server/helpers/custom-validators/search.js'import { AutomaticTagger } from '@server/lib/automatic-tags/automatic-tagger.js'import express from 'express'import { body, param } from 'express-validator'-import { doesAccountNameWithHostExist } from './shared/accounts.js'-import { checkUserCanManageAccount } from './shared/users.js'+import { doesAccountHandleExist } from './shared/accounts.js'import { areValidationErrors } from './shared/utils.js'export const manageAccountAutomaticTagsValidator = [@@ -13,8 +12,7 @@ export const manageAccountAutomaticTagsValidator = [async (req: express.Request, res: express.Response, next: express.NextFunction) => {if (areValidationErrors(req, res)) return- if (!await doesAccountNameWithHostExist(req.params.accountName, res)) return- if (!checkUserCanManageAccount({ user: res.locals.oauth.token.User, account: res.locals.account, specialRight: null, res })) return+ if (!await doesAccountHandleExist({ handle: req.params.accountName, res, checkIsLocal: true, checkManage: true })) returnreturn next()}diff --git a/server/core/middlewares/validators/blocklist.ts b/server/core/middlewares/validators/blocklist.tsindex 19f1bff1da..e3a8ae204e 100644--- a/server/core/middlewares/validators/blocklist.ts+++ b/server/core/middlewares/validators/blocklist.ts@@ -9,7 +9,7 @@ import { WEBSERVER } from '../../initializers/constants.js'import { AccountBlocklistModel } from '../../models/account/account-blocklist.js'import { ServerBlocklistModel } from '../../models/server/server-blocklist.js'import { ServerModel } from '../../models/server/server.js'-import { areValidationErrors, doesAccountNameWithHostExist } from './shared/index.js'+import { areValidationErrors, doesAccountHandleExist } from './shared/index.js'const blockAccountValidator = [body('accountName')@@ -17,7 +17,7 @@ const blockAccountValidator = [async (req: express.Request, res: express.Response, next: express.NextFunction) => {if (areValidationErrors(req, res)) return- if (!await doesAccountNameWithHostExist(req.body.accountName, res)) return+ if (!await doesAccountHandleExist({ handle: req.body.accountName, res, checkIsLocal: false, checkManage: false })) returnconst user = res.locals.oauth.token.Userconst accountToBlock = res.locals.account@@ -40,7 +40,7 @@ const unblockAccountByAccountValidator = [async (req: express.Request, res: express.Response, next: express.NextFunction) => {if (areValidationErrors(req, res)) return- if (!await doesAccountNameWithHostExist(req.params.accountName, res)) return+ if (!await doesAccountHandleExist({ handle: req.params.accountName, res, checkIsLocal: false, checkManage: false })) returnconst user = res.locals.oauth.token.Userconst targetAccount = res.locals.account@@ -56,7 +56,7 @@ const unblockAccountByServerValidator = [async (req: express.Request, res: express.Response, next: express.NextFunction) => {if (areValidationErrors(req, res)) return- if (!await doesAccountNameWithHostExist(req.params.accountName, res)) return+ if (!await doesAccountHandleExist({ handle: req.params.accountName, res, checkIsLocal: false, checkManage: false })) returnconst serverActor = await getServerActor()const targetAccount = res.locals.accountdiff --git a/server/core/middlewares/validators/bulk.ts b/server/core/middlewares/validators/bulk.tsindex fed3384494..f888b6587f 100644--- a/server/core/middlewares/validators/bulk.ts+++ b/server/core/middlewares/validators/bulk.ts@@ -1,10 +1,10 @@-import express from 'express'-import { body } from 'express-validator'import { BulkRemoveCommentsOfBody, HttpStatusCode, UserRight } from '@peertube/peertube-models'import { isBulkRemoveCommentsOfScopeValid } from '@server/helpers/custom-validators/bulk.js'-import { areValidationErrors, doesAccountNameWithHostExist } from './shared/index.js'+import express from 'express'+import { body } from 'express-validator'+import { areValidationErrors, doesAccountHandleExist } from './shared/index.js'-const bulkRemoveCommentsOfValidator = [+export const bulkRemoveCommentsOfValidator = [body('accountName').exists(),body('scope')@@ -12,7 +12,7 @@ const bulkRemoveCommentsOfValidator = [async (req: express.Request, res: express.Response, next: express.NextFunction) => {if (areValidationErrors(req, res)) return- if (!await doesAccountNameWithHostExist(req.body.accountName, res)) return+ if (!await doesAccountHandleExist({ handle: req.body.accountName, res, checkIsLocal: false, checkManage: false })) returnconst user = res.locals.oauth.token.Userconst body = req.body as BulkRemoveCommentsOfBody@@ -27,11 +27,3 @@ const bulkRemoveCommentsOfValidator = [return next()}]--// -----------------------------------------------------------------------------export {- bulkRemoveCommentsOfValidator-}--// ---------------------------------------------------------------------------diff --git a/server/core/middlewares/validators/feeds.ts b/server/core/middlewares/validators/feeds.tsindex 895dd35ba5..f770049c45 100644--- a/server/core/middlewares/validators/feeds.ts+++ b/server/core/middlewares/validators/feeds.ts@@ -1,16 +1,16 @@+import { HttpStatusCode } from '@peertube/peertube-models'import express from 'express'import { param, query } from 'express-validator'-import { HttpStatusCode } from '@peertube/peertube-models'import { isValidRSSFeed } from '../../helpers/custom-validators/feeds.js'import { exists, isIdOrUUIDValid, isIdValid, toCompleteUUID } from '../../helpers/custom-validators/misc.js'import {areValidationErrors,checkCanSeeVideo,+ doesAccountHandleExist,doesAccountIdExist,- doesAccountNameWithHostExist,+ doesChannelHandleExist,+ doesChannelIdExist,doesUserFeedTokenCorrespond,- doesVideoChannelIdExist,- doesVideoChannelNameWithHostExist,doesVideoExist} from './shared/index.js'@@ -90,10 +90,14 @@ const feedsAccountOrChannelFiltersValidator = [async (req: express.Request, res: express.Response, next: express.NextFunction) => {if (areValidationErrors(req, res)) return- if (req.query.accountId && !await doesAccountIdExist(req.query.accountId, res)) return- if (req.query.videoChannelId && !await doesVideoChannelIdExist(req.query.videoChannelId, res)) return- if (req.query.accountName && !await doesAccountNameWithHostExist(req.query.accountName, res)) return- if (req.query.videoChannelName && !await doesVideoChannelNameWithHostExist(req.query.videoChannelName, res)) return+ const { accountId, videoChannelId, accountName, videoChannelName } = req.query+ const commonOptions = { res, checkManage: false, checkIsLocal: false }++ if (accountId && !await doesAccountIdExist({ id: accountId, ...commonOptions })) return+ if (videoChannelId && !await doesChannelIdExist({ id: videoChannelId, ...commonOptions })) return++ if (accountName && !await doesAccountHandleExist({ handle: accountName, ...commonOptions })) return+ if (videoChannelName && !await doesChannelHandleExist({ handle: videoChannelName, ...commonOptions })) returnreturn next()}@@ -107,7 +111,7 @@ const videoFeedsPodcastValidator = [async (req: express.Request, res: express.Response, next: express.NextFunction) => {if (areValidationErrors(req, res)) return- if (!await doesVideoChannelIdExist(req.query.videoChannelId, res)) return+ if (!await doesChannelIdExist({ id: req.query.videoChannelId, checkManage: false, checkIsLocal: false, res })) returnreturn next()}@@ -125,7 +129,7 @@ const videoSubscriptionFeedsValidator = [async (req: express.Request, res: express.Response, next: express.NextFunction) => {if (areValidationErrors(req, res)) return- if (!await doesAccountIdExist(req.query.accountId, res)) return+ if (!await doesAccountIdExist({ id: req.query.accountId, res, checkIsLocal: true, checkManage: false })) returnif (!await doesUserFeedTokenCorrespond(res.locals.account.userId, req.query.token, res)) returnreturn next()@@ -157,11 +161,11 @@ const videoCommentsFeedsValidator = [// ---------------------------------------------------------------------------export {+ feedsAccountOrChannelFiltersValidator,feedsFormatValidator,setFeedFormatContentType,setFeedPodcastContentType,- feedsAccountOrChannelFiltersValidator,+ videoCommentsFeedsValidator,videoFeedsPodcastValidator,- videoSubscriptionFeedsValidator,- videoCommentsFeedsValidator+ videoSubscriptionFeedsValidator}diff --git a/server/core/middlewares/validators/shared/accounts.ts b/server/core/middlewares/validators/shared/accounts.tsindex 27c56a09ea..29fcecf7e2 100644--- a/server/core/middlewares/validators/shared/accounts.ts+++ b/server/core/middlewares/validators/shared/accounts.ts@@ -1,66 +1,73 @@-import { Response } from 'express'+import { forceNumber } from '@peertube/peertube-core-utils'+import { HttpStatusCode, UserRight } from '@peertube/peertube-models'import { AccountModel } from '@server/models/account/account.js'-import { UserModel } from '@server/models/user/user.js'import { MAccountDefault } from '@server/types/models/index.js'-import { forceNumber } from '@peertube/peertube-core-utils'-import { HttpStatusCode } from '@peertube/peertube-models'--function doesAccountIdExist (id: number | string, res: Response, sendNotFound = true) {- const promise = AccountModel.load(forceNumber(id))+import { Response } from 'express'+import { checkUserCanManageAccount } from './users.js'- return doesAccountExist(promise, res, sendNotFound)-}+export async function doesAccountIdExist (options: {+ id: string | number+ res: Response+ checkManage: boolean // Also check the user can manage the account+ checkIsLocal: boolean // Also check this is a local channel+}) {+ const { id, res, checkIsLocal, checkManage } = options-function doesLocalAccountNameExist (name: string, res: Response, sendNotFound = true) {- const promise = AccountModel.loadLocalByName(name)+ const account = await AccountModel.load(forceNumber(id))- return doesAccountExist(promise, res, sendNotFound)+ return doesAccountExist({ account, res, checkIsLocal, checkManage })}-function doesAccountNameWithHostExist (nameWithDomain: string, res: Response, sendNotFound = true) {- const promise = AccountModel.loadByNameWithHost(nameWithDomain)+export async function doesAccountHandleExist (options: {+ handle: string+ res: Response+ checkManage: boolean // Also check the user can manage the account+ checkIsLocal: boolean // Also check this is a local channel+}) {+ const { handle, res, checkIsLocal, checkManage } = options- return doesAccountExist(promise, res, sendNotFound)+ const account = await AccountModel.loadByNameWithHost(handle)++ return doesAccountExist({ account, res, checkIsLocal, checkManage })}-async function doesAccountExist (p: Promise<MAccountDefault>, res: Response, sendNotFound: boolean) {- const account = await p+// ---------------------------------------------------------------------------+// Private+// ---------------------------------------------------------------------------++function doesAccountExist (options: {+ account: MAccountDefault+ res: Response+ checkManage: boolean+ checkIsLocal: boolean+}) {+ const { account, res, checkIsLocal, checkManage } = optionsif (!account) {- if (sendNotFound === true) {- res.fail({- status: HttpStatusCode.NOT_FOUND_404,- message: 'Account not found'- })- }+ res.fail({+ status: HttpStatusCode.NOT_FOUND_404,+ message: 'Account not found'+ })return false}- res.locals.account = account- return true-}+ if (checkManage) {+ const user = res.locals.oauth.token.User-async function doesUserFeedTokenCorrespond (id: number, token: string, res: Response) {- const user = await UserModel.loadByIdWithChannels(forceNumber(id))+ if (!checkUserCanManageAccount({ account, user, res, specialRight: UserRight.MANAGE_USERS })) {+ return false+ }+ }- if (token !== user.feedToken) {+ if (checkIsLocal && account.Actor.isOwned() === false) {res.fail({status: HttpStatusCode.FORBIDDEN_403,- message: 'User and token mismatch'+ message: 'This account is not owned.'})+return false}- res.locals.user = user+ res.locals.account = accountreturn true}--// -----------------------------------------------------------------------------export {- doesAccountIdExist,- doesLocalAccountNameExist,- doesAccountNameWithHostExist,- doesAccountExist,- doesUserFeedTokenCorrespond-}diff --git a/server/core/middlewares/validators/shared/users.ts b/server/core/middlewares/validators/shared/users.tsindex 4b227f8a0a..98e65881f2 100644--- a/server/core/middlewares/validators/shared/users.ts+++ b/server/core/middlewares/validators/shared/users.ts@@ -12,11 +12,15 @@ export function checkUserIdExist (idArg: number | string, res: express.Response,}export function checkUserEmailExistPermissive (email: string, res: express.Response, abortResponse = true) {- return checkUserExist(async () => {- const users = await UserModel.loadByEmailCaseInsensitive(email)-- return getUserByEmailPermissive(users, email)- }, res, abortResponse)+ return checkUserExist(+ async () => {+ const users = await UserModel.loadByEmailCaseInsensitive(email)++ return getUserByEmailPermissive(users, email)+ },+ res,+ abortResponse+ )}export async function checkUsernameOrEmailDoNotAlreadyExist (username: string, email: string, res: express.Response) {@@ -102,3 +106,18 @@ export function checkUserCanManageAccount (options: {return false}++export async function doesUserFeedTokenCorrespond (id: number, token: string, res: express.Response) {+ const user = await UserModel.loadByIdWithChannels(forceNumber(id))++ if (token !== user.feedToken) {+ res.fail({+ status: HttpStatusCode.FORBIDDEN_403,+ message: 'User and token mismatch'+ })+ return false+ }++ res.locals.user = user+ return true+}diff --git a/server/core/middlewares/validators/shared/video-channels.ts b/server/core/middlewares/validators/shared/video-channels.tsindex eee379c190..a1b589db00 100644--- a/server/core/middlewares/validators/shared/video-channels.ts+++ b/server/core/middlewares/validators/shared/video-channels.ts@@ -1,29 +1,48 @@-import express from 'express'+import { HttpStatusCode, UserRight } from '@peertube/peertube-models'import { VideoChannelModel } from '@server/models/video/video-channel.js'import { MChannelBannerAccountDefault } from '@server/types/models/index.js'-import { HttpStatusCode } from '@peertube/peertube-models'+import express from 'express'+import { checkUserCanManageAccount } from './users.js'-async function doesVideoChannelIdExist (id: number, res: express.Response) {- const videoChannel = await VideoChannelModel.loadAndPopulateAccount(+id)+export async function doesChannelIdExist (options: {+ id: number+ checkManage: boolean // Also check the user can manage the account+ checkIsLocal: boolean // Also check this is a local channel+ res: express.Response+}) {+ const { id, checkManage, checkIsLocal, res } = options- return processVideoChannelExist(videoChannel, res)+ const channel = await VideoChannelModel.loadAndPopulateAccount(+id)++ return processVideoChannelExist({ channel, checkManage, checkIsLocal, res })}-async function doesVideoChannelNameWithHostExist (nameWithDomain: string, res: express.Response) {- const videoChannel = await VideoChannelModel.loadByNameWithHostAndPopulateAccount(nameWithDomain)+export async function doesChannelHandleExist (options: {+ handle: string+ checkManage: boolean // Also check the user can manage the account+ checkIsLocal: boolean // Also check this is a local channel+ res: express.Response+}) {+ const { handle, checkManage, checkIsLocal, res } = options++ const channel = await VideoChannelModel.loadByHandleAndPopulateAccount(handle)- return processVideoChannelExist(videoChannel, res)+ return processVideoChannelExist({ channel, checkManage, checkIsLocal, res })}+// ---------------------------------------------------------------------------+// Private// ----------------------------------------------------------------------------export {- doesVideoChannelIdExist,- doesVideoChannelNameWithHostExist-}+function processVideoChannelExist (options: {+ channel: MChannelBannerAccountDefault+ res: express.Response+ checkManage: boolean+ checkIsLocal: boolean+}) {+ const { channel, res, checkManage, checkIsLocal } = options-function processVideoChannelExist (videoChannel: MChannelBannerAccountDefault, res: express.Response) {- if (!videoChannel) {+ if (!channel) {res.fail({status: HttpStatusCode.NOT_FOUND_404,message: 'Video channel not found'@@ -31,6 +50,23 @@ function processVideoChannelExist (videoChannel: MChannelBannerAccountDefault, rreturn false}- res.locals.videoChannel = videoChannel+ if (checkManage) {+ const user = res.locals.oauth.token.User++ if (!checkUserCanManageAccount({ account: channel.Account, user, res, specialRight: UserRight.MANAGE_ANY_VIDEO_CHANNEL })) {+ return false+ }+ }++ if (checkIsLocal && channel.Actor.isOwned() === false) {+ res.fail({+ status: HttpStatusCode.FORBIDDEN_403,+ message: 'This channel is not owned.'+ })++ return false+ }++ res.locals.videoChannel = channelreturn true}diff --git a/server/core/middlewares/validators/users/users.ts b/server/core/middlewares/validators/users/users.tsindex 1dadfa1ba1..341c0c766d 100644--- a/server/core/middlewares/validators/users/users.ts+++ b/server/core/middlewares/validators/users/users.ts@@ -1,7 +1,8 @@import { arrayify, forceNumber } from '@peertube/peertube-core-utils'-import { HttpStatusCode, ServerErrorCode, UserRight, UserRole } from '@peertube/peertube-models'+import { HttpStatusCode, ServerErrorCode, UserRole } from '@peertube/peertube-models'import { isStringArray } from '@server/helpers/custom-validators/search.js'import { Hooks } from '@server/lib/plugins/hooks.js'+import { MUser } from '@server/types/models/user/user.js'import express from 'express'import { body, param, query } from 'express-validator'import { exists, isIdValid, toBooleanOrNull, toIntOrNull } from '../../../helpers/custom-validators/misc.js'@@ -34,11 +35,10 @@ import { ActorModel } from '../../../models/actor/actor.js'import {areValidationErrors,checkEmailDoesNotAlreadyExist,- checkUserCanManageAccount,checkUserEmailExistPermissive,checkUserIdExist,checkUsernameOrEmailDoNotAlreadyExist,- doesVideoChannelIdExist,+ doesChannelIdExist,doesVideoExist,isValidVideoIdParam} from '../shared/index.js'@@ -128,11 +128,13 @@ export const usersRemoveValidator = [return res.fail({ message: 'Cannot remove the root user' })}+ if (!checkUserCanModerate(user, res)) return+return next()}]-export const usersBlockingValidator = [+export const usersBlockToggleValidator = [param('id').custom(isIdValid),body('reason')@@ -148,6 +150,8 @@ export const usersBlockingValidator = [return res.fail({ message: 'Cannot block the root user' })}+ if (!checkUserCanModerate(user, res)) return+return next()}]@@ -201,6 +205,8 @@ export const usersUpdateValidator = [return res.fail({ message: 'Cannot change root role.' })}+ if (!checkUserCanModerate(user, res)) return+if (req.body.email && req.body.email !== user.email && !await checkEmailDoesNotAlreadyExist(req.body.email, res)) returnreturn next()@@ -328,7 +334,7 @@ export const usersVideosValidator = [async (req: express.Request, res: express.Response, next: express.NextFunction) => {if (areValidationErrors(req, res)) return- if (req.query.channelId && !await doesVideoChannelIdExist(req.query.channelId, res)) return+ if (req.query.channelId && !await doesChannelIdExist({ id: req.query.channelId, checkManage: true, checkIsLocal: true, res })) returnreturn next()}@@ -431,38 +437,20 @@ export const userAutocompleteValidator = [.not().isEmpty()]-export const ensureAuthUserOwnsAccountValidator = [- (req: express.Request, res: express.Response, next: express.NextFunction) => {- const user = res.locals.oauth.token.User+// ---------------------------------------------------------------------------+// Private+// ---------------------------------------------------------------------------- if (!checkUserCanManageAccount({ user, account: res.locals.account, specialRight: null, res })) return+function checkUserCanModerate (onUser: MUser, res: express.Response) {+ const authUser = res.locals.oauth.token.User- return next()- }-]+ if (authUser.role === UserRole.ADMINISTRATOR) return true+ if (authUser.role === UserRole.MODERATOR && onUser.role === UserRole.USER) return true-export const ensureCanManageChannelOrAccount = [- (req: express.Request, res: express.Response, next: express.NextFunction) => {- const user = res.locals.oauth.token.user- const account = res.locals.videoChannel?.Account ?? res.locals.account+ res.fail({+ status: HttpStatusCode.FORBIDDEN_403,+ message: 'Users can only be managed by moderators or admins.'+ })- if (!checkUserCanManageAccount({ account, user, res, specialRight: UserRight.MANAGE_ANY_VIDEO_CHANNEL })) return-- return next()- }-]--export const ensureCanModerateUser = [- (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.fail({- status: HttpStatusCode.FORBIDDEN_403,- message: 'Users can only be managed by moderators or admins.'- })- }-]+ return false+}diff --git a/server/core/middlewares/validators/videos/video-channel-sync.ts b/server/core/middlewares/validators/videos/video-channel-sync.tsindex 1daf406254..47f43199b6 100644--- a/server/core/middlewares/validators/videos/video-channel-sync.ts+++ b/server/core/middlewares/validators/videos/video-channel-sync.ts@@ -4,7 +4,7 @@ import { isUrlValid } from '@server/helpers/custom-validators/activitypub/misc.jimport { CONFIG } from '@server/initializers/config.js'import { VideoChannelSyncModel } from '@server/models/video/video-channel-sync.js'import { HttpStatusCode, VideoChannelSyncCreate } from '@peertube/peertube-models'-import { areValidationErrors, doesVideoChannelIdExist } from '../shared/index.js'+import { areValidationErrors, doesChannelIdExist } from '../shared/index.js'import { doesVideoChannelSyncIdExist } from '../shared/video-channel-syncs.js'export const ensureSyncIsEnabled = (req: express.Request, res: express.Response, next: express.NextFunction) => {@@ -29,7 +29,7 @@ export const videoChannelSyncValidator = [if (areValidationErrors(req, res)) returnconst body: VideoChannelSyncCreate = req.body- if (!await doesVideoChannelIdExist(body.videoChannelId, res)) return+ if (!await doesChannelIdExist({ id: body.videoChannelId, checkManage: true, checkIsLocal: true, res })) returnconst count = await VideoChannelSyncModel.countByAccount(res.locals.videoChannel.accountId)if (count >= CONFIG.IMPORT.VIDEO_CHANNEL_SYNCHRONIZATION.MAX_PER_USER) {@@ -49,7 +49,7 @@ export const ensureSyncExists = [if (areValidationErrors(req, res)) returnif (!await doesVideoChannelSyncIdExist(+req.params.id, res)) return- if (!await doesVideoChannelIdExist(res.locals.videoChannelSync.videoChannelId, res)) return+ if (!await doesChannelIdExist({ id: res.locals.videoChannelSync.videoChannelId, checkManage: true, checkIsLocal: true, res })) returnreturn next()}diff --git a/server/core/middlewares/validators/videos/video-channels.ts b/server/core/middlewares/validators/videos/video-channels.tsindex f67bc25740..a98665c4ac 100644--- a/server/core/middlewares/validators/videos/video-channels.ts+++ b/server/core/middlewares/validators/videos/video-channels.ts@@ -1,9 +1,9 @@-import express from 'express'-import { body, param, query } from 'express-validator'import { HttpStatusCode, VideosImportInChannelCreate } from '@peertube/peertube-models'import { isUrlValid } from '@server/helpers/custom-validators/activitypub/misc.js'import { CONFIG } from '@server/initializers/config.js'import { MChannelAccountDefault } from '@server/types/models/index.js'+import express from 'express'+import { body, param, query } from 'express-validator'import { isBooleanValid, isIdValid, toBooleanOrNull } from '../../../helpers/custom-validators/misc.js'import {isVideoChannelDescriptionValid,@@ -13,7 +13,7 @@ import {} from '../../../helpers/custom-validators/video-channels.js'import { ActorModel } from '../../../models/actor/actor.js'import { VideoChannelModel } from '../../../models/video/video-channel.js'-import { areValidationErrors, checkUserQuota, doesVideoChannelNameWithHostExist } from '../shared/index.js'+import { areValidationErrors, checkUserQuota, doesChannelHandleExist } from '../shared/index.js'import { doesVideoChannelSyncIdExist } from '../shared/video-channel-syncs.js'export const videoChannelsAddValidator = [@@ -82,31 +82,25 @@ export const videoChannelsRemoveValidator = [}]-export const videoChannelsNameWithHostValidator = [- param('nameWithHost')- .exists(),+export const videoChannelsHandleValidatorFactory = (options: {+ checkIsLocal: boolean+ checkManage: boolean+}) => {+ const { checkIsLocal, checkManage } = options- async (req: express.Request, res: express.Response, next: express.NextFunction) => {- if (areValidationErrors(req, res)) return+ return [+ param('nameWithHost')+ .exists(),- if (!await doesVideoChannelNameWithHostExist(req.params.nameWithHost, res)) return+ async (req: express.Request, res: express.Response, next: express.NextFunction) => {+ if (areValidationErrors(req, res)) return- return next()- }-]+ if (!await doesChannelHandleExist({ handle: req.params.nameWithHost, checkManage, checkIsLocal, res })) return-export const ensureIsLocalChannel = [- (req: express.Request, res: express.Response, next: express.NextFunction) => {- if (res.locals.videoChannel.Actor.isOwned() === false) {- return res.fail({- status: HttpStatusCode.FORBIDDEN_403,- message: 'This channel is not owned.'- })+ return next()}-- return next()- }-]+ ]+}export const ensureChannelOwnerCanUpload = [async (req: express.Request, res: express.Response, next: express.NextFunction) => {diff --git a/server/core/middlewares/validators/videos/video-comments.ts b/server/core/middlewares/validators/videos/video-comments.tsindex a3f15dc99e..61207bb2e3 100644--- a/server/core/middlewares/validators/videos/video-comments.ts+++ b/server/core/middlewares/validators/videos/video-comments.ts@@ -24,7 +24,7 @@ import {checkCanSeeVideo,checkUserCanManageAccount,checkUserCanManageVideo,- doesVideoChannelIdExist,+ doesChannelIdExist,doesVideoCommentExist,doesVideoCommentThreadExist,doesVideoExist,@@ -51,7 +51,9 @@ export const listAllVideoCommentsForAdminValidator = [if (areValidationErrors(req, res)) returnif (req.query.videoId && !await doesVideoExist(req.query.videoId, res, 'unsafe-only-immutable-attributes')) return- if (req.query.videoChannelId && !await doesVideoChannelIdExist(req.query.videoChannelId, res)) return+ if (+ req.query.videoChannelId && !await doesChannelIdExist({ id: req.query.videoChannelId, checkManage: true, checkIsLocal: true, res })+ ) returnreturn next()}@@ -70,7 +72,9 @@ export const listCommentsOnUserVideosValidator = [if (areValidationErrors(req, res)) returnif (req.query.videoId && !await doesVideoExist(req.query.videoId, res, 'all')) return- if (req.query.videoChannelId && !await doesVideoChannelIdExist(req.query.videoChannelId, res)) return+ if (+ req.query.videoChannelId && !await doesChannelIdExist({ id: req.query.videoChannelId, checkManage: true, checkIsLocal: true, res })+ ) returnconst user = res.locals.oauth.token.Userdiff --git a/server/core/middlewares/validators/watched-words.ts b/server/core/middlewares/validators/watched-words.tsindex 3213d1b120..63b43c2cd9 100644--- a/server/core/middlewares/validators/watched-words.ts+++ b/server/core/middlewares/validators/watched-words.ts@@ -7,8 +7,7 @@ import { WatchedWordsListModel } from '@server/models/watched-words/watched-wordimport { MAccountId, MWatchedWordsList } from '@server/types/models/index.js'import express from 'express'import { ValidationChain, body, param } from 'express-validator'-import { doesAccountNameWithHostExist } from './shared/accounts.js'-import { checkUserCanManageAccount } from './shared/users.js'+import { doesAccountHandleExist } from './shared/accounts.js'import { areValidationErrors } from './shared/utils.js'export const manageAccountWatchedWordsListValidator = [@@ -17,8 +16,7 @@ export const manageAccountWatchedWordsListValidator = [async (req: express.Request, res: express.Response, next: express.NextFunction) => {if (areValidationErrors(req, res)) return- if (!await doesAccountNameWithHostExist(req.params.accountName, res)) return- if (!checkUserCanManageAccount({ user: res.locals.oauth.token.User, account: res.locals.account, specialRight: null, res })) return+ if (!await doesAccountHandleExist({ handle: req.params.accountName, res, checkIsLocal: true, checkManage: true })) returnreturn next()}@@ -59,14 +57,14 @@ function buildUpdateOrAddValidators ({ optional }: { optional: boolean }) {.trim().custom(isWatchedWordListNameValid).withMessage(`Should have a list name between ` +- `${CONSTRAINTS_FIELDS.WATCHED_WORDS.LIST_NAME.min} and ${CONSTRAINTS_FIELDS.WATCHED_WORDS.LIST_NAME.max} characters long`+ `${CONSTRAINTS_FIELDS.WATCHED_WORDS.LIST_NAME.min} and ${CONSTRAINTS_FIELDS.WATCHED_WORDS.LIST_NAME.max} characters long`),makeOptionalIfNeeded(body('words')).custom(areWatchedWordsValid).withMessage(`Should have an array of up to ${CONSTRAINTS_FIELDS.WATCHED_WORDS.WORDS.max} words between ` +- `${CONSTRAINTS_FIELDS.WATCHED_WORDS.WORD.min} and ${CONSTRAINTS_FIELDS.WATCHED_WORDS.WORD.max} characters each`+ `${CONSTRAINTS_FIELDS.WATCHED_WORDS.WORD.min} and ${CONSTRAINTS_FIELDS.WATCHED_WORDS.WORD.max} characters each`)]}diff --git a/server/core/models/video/video-channel.ts b/server/core/models/video/video-channel.tsindex 6890a75a64..40efb79bce 100644--- a/server/core/models/video/video-channel.ts+++ b/server/core/models/video/video-channel.ts@@ -725,8 +725,8 @@ export class VideoChannelModel extends SequelizeModel<VideoChannelModel> {.findOne(query)}- static loadByNameWithHostAndPopulateAccount (nameWithHost: string) {- const [ name, host ] = nameWithHost.split('@')+ static loadByHandleAndPopulateAccount (handle: string) {+ const [ name, host ] = handle.split('@')if (!host || host === WEBSERVER.HOST) return VideoChannelModel.loadLocalByNameAndPopulateAccount(name)