X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Fapi%2Fserver%2Ffollows.ts;h=207a09a4cdfda1d5bb39ee42109af9ca3dc38932;hb=14893eb71cb2d4ca47e07589c81958863603aba4;hp=40b62d97739f1846cb808526c7412e5683925f7b;hpb=f05a1c30c15d2ae35c11e241ca039a72eeb7d6ad;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/api/server/follows.ts b/server/controllers/api/server/follows.ts index 40b62d977..207a09a4c 100644 --- a/server/controllers/api/server/follows.ts +++ b/server/controllers/api/server/follows.ts @@ -1,23 +1,31 @@ import * as express from 'express' import { UserRight } from '../../../../shared/models/users' -import { sanitizeHost } from '../../../helpers/core-utils' -import { retryTransactionWrapper } from '../../../helpers/database-utils' import { logger } from '../../../helpers/logger' import { getFormattedObjects, getServerActor } from '../../../helpers/utils' -import { loadActorUrlOrGetFromWebfinger } from '../../../helpers/webfinger' -import { REMOTE_SCHEME, sequelizeTypescript, SERVER_ACTOR_NAME } from '../../../initializers' -import { getOrCreateActorAndServerAndModel } from '../../../lib/activitypub/actor' -import { sendFollow, sendUndoFollow } from '../../../lib/activitypub/send' +import { sequelizeTypescript, SERVER_ACTOR_NAME } from '../../../initializers' +import { sendAccept, sendReject, sendUndoFollow } from '../../../lib/activitypub/send' import { - asyncMiddleware, authenticate, ensureUserHasRight, paginationValidator, removeFollowingValidator, setBodyHostsPort, setDefaultSort, - setDefaultPagination + asyncMiddleware, + authenticate, + ensureUserHasRight, + paginationValidator, + setBodyHostsPort, + setDefaultPagination, + setDefaultSort } from '../../../middlewares' -import { followersSortValidator, followingSortValidator, followValidator } from '../../../middlewares/validators' -import { ActorModel } from '../../../models/activitypub/actor' +import { + acceptOrRejectFollowerValidator, + followersSortValidator, + followingSortValidator, + followValidator, + getFollowerValidator, + removeFollowingValidator +} from '../../../middlewares/validators' import { ActorFollowModel } from '../../../models/activitypub/actor-follow' +import { JobQueue } from '../../../lib/job-queue' +import { removeRedundancyOf } from '../../../lib/redundancy' const serverFollowsRouter = express.Router() - serverFollowsRouter.get('/following', paginationValidator, followingSortValidator, @@ -31,14 +39,14 @@ serverFollowsRouter.post('/following', ensureUserHasRight(UserRight.MANAGE_SERVER_FOLLOW), followValidator, setBodyHostsPort, - asyncMiddleware(followRetry) + asyncMiddleware(followInstance) ) serverFollowsRouter.delete('/following/:host', authenticate, ensureUserHasRight(UserRight.MANAGE_SERVER_FOLLOW), asyncMiddleware(removeFollowingValidator), - asyncMiddleware(removeFollow) + asyncMiddleware(removeFollowing) ) serverFollowsRouter.get('/followers', @@ -49,6 +57,29 @@ serverFollowsRouter.get('/followers', asyncMiddleware(listFollowers) ) +serverFollowsRouter.delete('/followers/:nameWithHost', + authenticate, + ensureUserHasRight(UserRight.MANAGE_SERVER_FOLLOW), + asyncMiddleware(getFollowerValidator), + asyncMiddleware(removeOrRejectFollower) +) + +serverFollowsRouter.post('/followers/:nameWithHost/reject', + authenticate, + ensureUserHasRight(UserRight.MANAGE_SERVER_FOLLOW), + asyncMiddleware(getFollowerValidator), + acceptOrRejectFollowerValidator, + asyncMiddleware(removeOrRejectFollower) +) + +serverFollowsRouter.post('/followers/:nameWithHost/accept', + authenticate, + ensureUserHasRight(UserRight.MANAGE_SERVER_FOLLOW), + asyncMiddleware(getFollowerValidator), + acceptOrRejectFollowerValidator, + asyncMiddleware(acceptFollower) +) + // --------------------------------------------------------------------------- export { @@ -57,91 +88,88 @@ export { // --------------------------------------------------------------------------- -async function listFollowing (req: express.Request, res: express.Response, next: express.NextFunction) { +async function listFollowing (req: express.Request, res: express.Response) { const serverActor = await getServerActor() - const resultList = await ActorFollowModel.listFollowingForApi(serverActor.id, req.query.start, req.query.count, req.query.sort) + const resultList = await ActorFollowModel.listFollowingForApi( + serverActor.id, + req.query.start, + req.query.count, + req.query.sort, + req.query.search + ) return res.json(getFormattedObjects(resultList.data, resultList.total)) } -async function listFollowers (req: express.Request, res: express.Response, next: express.NextFunction) { +async function listFollowers (req: express.Request, res: express.Response) { const serverActor = await getServerActor() - const resultList = await ActorFollowModel.listFollowersForApi(serverActor.id, req.query.start, req.query.count, req.query.sort) + const resultList = await ActorFollowModel.listFollowersForApi( + serverActor.id, + req.query.start, + req.query.count, + req.query.sort, + req.query.search + ) return res.json(getFormattedObjects(resultList.data, resultList.total)) } -async function followRetry (req: express.Request, res: express.Response, next: express.NextFunction) { +async function followInstance (req: express.Request, res: express.Response) { const hosts = req.body.hosts as string[] - const fromActor = await getServerActor() - - const tasks: Promise[] = [] - const actorName = SERVER_ACTOR_NAME + const follower = await getServerActor() for (const host of hosts) { - const sanitizedHost = sanitizeHost(host, REMOTE_SCHEME.HTTP) - - // We process each host in a specific transaction - // First, we add the follow request in the database - // Then we send the follow request to other actor - const p = loadActorUrlOrGetFromWebfinger(actorName, sanitizedHost) - .then(actorUrl => getOrCreateActorAndServerAndModel(actorUrl)) - .then(targetActor => { - const options = { - arguments: [ fromActor, targetActor ], - errorMessage: 'Cannot follow with many retries.' - } - - return retryTransactionWrapper(follow, options) - }) - .catch(err => logger.warn('Cannot follow server %s.', sanitizedHost, err)) - - tasks.push(p) + const payload = { + host, + name: SERVER_ACTOR_NAME, + followerActorId: follower.id + } + + JobQueue.Instance.createJob({ type: 'activitypub-follow', payload }) + .catch(err => logger.error('Cannot create follow job for %s.', host, err)) } - // Don't make the client wait the tasks - Promise.all(tasks) - .catch(err => logger.error('Error in follow.', err)) - return res.status(204).end() } -function follow (fromActor: ActorModel, targetActor: ActorModel) { - return sequelizeTypescript.transaction(async t => { - const [ actorFollow ] = await ActorFollowModel.findOrCreate({ - where: { - actorId: fromActor.id, - targetActorId: targetActor.id - }, - defaults: { - state: 'pending', - actorId: fromActor.id, - targetActorId: targetActor.id - }, - transaction: t - }) - actorFollow.ActorFollowing = targetActor - actorFollow.ActorFollower = fromActor - - // Send a notification to remote server - await sendFollow(actorFollow, t) - }) -} - -async function removeFollow (req: express.Request, res: express.Response, next: express.NextFunction) { - const follow: ActorFollowModel = res.locals.follow +async function removeFollowing (req: express.Request, res: express.Response) { + const follow = res.locals.follow await sequelizeTypescript.transaction(async t => { if (follow.state === 'accepted') await sendUndoFollow(follow, t) + // Disable redundancy on unfollowed instances + const server = follow.ActorFollowing.Server + server.redundancyAllowed = false + await server.save({ transaction: t }) + + // Async, could be long + removeRedundancyOf(server.id) + .catch(err => logger.error('Cannot remove redundancy of %s.', server.host, err)) + await follow.destroy({ transaction: t }) }) - // Destroy the actor that will destroy video channels, videos and video files too - // This could be long so don't wait this task - const following = follow.ActorFollowing - following.destroy() - .catch(err => logger.error('Cannot destroy actor that we do not follow anymore %s.', following.url, err)) + return res.status(204).end() +} + +async function removeOrRejectFollower (req: express.Request, res: express.Response) { + const follow = res.locals.follow + + await sendReject(follow.ActorFollower, follow.ActorFollowing) + + await follow.destroy() + + return res.status(204).end() +} + +async function acceptFollower (req: express.Request, res: express.Response) { + const follow = res.locals.follow + + await sendAccept(follow) + + follow.state = 'accepted' + await follow.save() return res.status(204).end() }