X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fredundancy.ts;h=2a92412491bd112b07efe7e7f7ecdadec5e9370e;hb=e83d06a7025a6b85bb8e648b1a5361b18ea83ed3;hp=78d84e02e97d7d8648ff8f4bed3eac99ea7fc5ed;hpb=a3b7421abb4192e215aa280418b62e96958c5e42;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/redundancy.ts b/server/lib/redundancy.ts index 78d84e02e..2a9241249 100644 --- a/server/lib/redundancy.ts +++ b/server/lib/redundancy.ts @@ -1,8 +1,12 @@ +import { Transaction } from 'sequelize' +import { logger } from '@server/helpers/logger' +import { CONFIG } from '@server/initializers/config' +import { ActorFollowModel } from '@server/models/actor/actor-follow' +import { getServerActor } from '@server/models/application/application' +import { MActorSignature, MVideoRedundancyVideo } from '@server/types/models' +import { Activity } from '@shared/models' import { VideoRedundancyModel } from '../models/redundancy/video-redundancy' import { sendUndoCacheFile } from './activitypub/send' -import { Transaction } from 'sequelize' -import { getServerActor } from '../helpers/utils' -import { MVideoRedundancyVideo } from '@server/typings/models' async function removeVideoRedundancy (videoRedundancy: MVideoRedundancyVideo, t?: Transaction) { const serverActor = await getServerActor() @@ -21,9 +25,30 @@ async function removeRedundanciesOfServer (serverId: number) { } } +async function isRedundancyAccepted (activity: Activity, byActor: MActorSignature) { + const configAcceptFrom = CONFIG.REMOTE_REDUNDANCY.VIDEOS.ACCEPT_FROM + if (configAcceptFrom === 'nobody') { + logger.info('Do not accept remote redundancy %s due instance accept policy.', activity.id) + return false + } + + if (configAcceptFrom === 'followings') { + const serverActor = await getServerActor() + const allowed = await ActorFollowModel.isFollowedBy(byActor.id, serverActor.id) + + if (allowed !== true) { + logger.info('Do not accept remote redundancy %s because actor %s is not followed by our instance.', activity.id, byActor.url) + return false + } + } + + return true +} + // --------------------------------------------------------------------------- export { + isRedundancyAccepted, removeRedundanciesOfServer, removeVideoRedundancy }