X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Factor.ts;h=f27733418fc83bc176394a0a6bd3f73f92c94742;hb=28be89161aab245526d64f6fb7dd29391a97fe0a;hp=c3255d8ca1ac408e95b0b07b73626969abbda005;hpb=ac81d1a06d57b9ae86663831e7f5edcef57b0fa4;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts index c3255d8ca..f27733418 100644 --- a/server/lib/activitypub/actor.ts +++ b/server/lib/activitypub/actor.ts @@ -5,19 +5,22 @@ import * as url from 'url' import * as uuidv4 from 'uuid/v4' import { ActivityPubActor, ActivityPubActorType } from '../../../shared/models/activitypub' import { ActivityPubAttributedTo } from '../../../shared/models/activitypub/objects' -import { isActorObjectValid } from '../../helpers/custom-validators/activitypub/actor' +import { getActorUrl } from '../../helpers/activitypub' +import { isActorObjectValid, normalizeActor } from '../../helpers/custom-validators/activitypub/actor' import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' import { retryTransactionWrapper, updateInstanceWithAnother } from '../../helpers/database-utils' import { logger } from '../../helpers/logger' import { createPrivateAndPublicKeys } from '../../helpers/peertube-crypto' import { doRequest, doRequestAndSaveToFile } from '../../helpers/requests' import { getUrlFromWebfinger } from '../../helpers/webfinger' -import { IMAGE_MIMETYPE_EXT, CONFIG, sequelizeTypescript } from '../../initializers' +import { CONFIG, IMAGE_MIMETYPE_EXT, sequelizeTypescript } from '../../initializers' import { AccountModel } from '../../models/account/account' import { ActorModel } from '../../models/activitypub/actor' import { AvatarModel } from '../../models/avatar/avatar' import { ServerModel } from '../../models/server/server' import { VideoChannelModel } from '../../models/video/video-channel' +import { JobQueue } from '../job-queue' +import { getServerActor } from '../../helpers/utils' // Set account keys, this could be long so process after the account creation and do not block the client function setAsyncActorKeys (actor: ActorModel) { @@ -28,12 +31,14 @@ function setAsyncActorKeys (actor: ActorModel) { return actor.save() }) .catch(err => { - logger.error('Cannot set public/private keys of actor %d.', actor.uuid, err) + logger.error('Cannot set public/private keys of actor %d.', actor.uuid, { err }) return actor }) } -async function getOrCreateActorAndServerAndModel (actorUrl: string, recurseIfNeeded = true) { +async function getOrCreateActorAndServerAndModel (activityActor: string | ActivityPubActor, recurseIfNeeded = true) { + const actorUrl = getActorUrl(activityActor) + let actor = await ActorModel.loadByUrl(actorUrl) // We don't have this actor in our database, fetch it on remote @@ -113,7 +118,7 @@ async function updateActorAvatarInstance (actorInstance: ActorModel, avatarName: try { await actorInstance.Avatar.destroy({ transaction: t }) } catch (err) { - logger.error('Cannot remove old avatar of actor %s.', actorInstance.url, err) + logger.error('Cannot remove old avatar of actor %s.', actorInstance.url, { err }) } } @@ -140,7 +145,7 @@ async function fetchActorTotalItems (url: string) { const { body } = await doRequest(options) return body.totalItems ? body.totalItems : 0 } catch (err) { - logger.warn('Cannot fetch remote actor count %s.', url, err) + logger.warn('Cannot fetch remote actor count %s.', url, { err }) return 0 } } @@ -166,6 +171,21 @@ async function fetchAvatarIfExists (actorJSON: ActivityPubActor) { return undefined } +async function addFetchOutboxJob (actor: ActorModel) { + // Don't fetch ourselves + const serverActor = await getServerActor() + if (serverActor.id === actor.id) { + logger.error('Cannot fetch our own outbox!') + return undefined + } + + const payload = { + uris: [ actor.outboxUrl ] + } + + return JobQueue.Instance.createJob({ type: 'activitypub-http-fetcher', payload }) +} + export { getOrCreateActorAndServerAndModel, buildActorInstance, @@ -173,7 +193,8 @@ export { fetchActorTotalItems, fetchAvatarIfExists, updateActorInstance, - updateActorAvatarInstance + updateActorAvatarInstance, + addFetchOutboxJob } // --------------------------------------------------------------------------- @@ -225,12 +246,10 @@ function saveActorAndServerAndModelIfNotExist ( }) if (actorCreated.type === 'Person' || actorCreated.type === 'Application') { - const account = await saveAccount(actorCreated, result, t) - actorCreated.Account = account + actorCreated.Account = await saveAccount(actorCreated, result, t) actorCreated.Account.Actor = actorCreated } else if (actorCreated.type === 'Group') { // Video channel - const videoChannel = await saveVideoChannel(actorCreated, result, ownerActor, t) - actorCreated.VideoChannel = videoChannel + actorCreated.VideoChannel = await saveVideoChannel(actorCreated, result, ownerActor, t) actorCreated.VideoChannel.Actor = actorCreated } @@ -242,6 +261,7 @@ type FetchRemoteActorResult = { actor: ActorModel name: string summary: string + support?: string avatarName?: string attributedTo: ActivityPubAttributedTo[] } @@ -256,7 +276,9 @@ async function fetchRemoteActor (actorUrl: string): Promise { if (!actor.isOutdated()) return actor try { @@ -352,25 +377,21 @@ async function refreshActorIfNeeded (actor: ActorModel) { await actor.save({ transaction: t }) actor.Account.set('name', result.name) + actor.Account.set('description', result.summary) await actor.Account.save({ transaction: t }) } else if (actor.VideoChannel) { await actor.save({ transaction: t }) actor.VideoChannel.set('name', result.name) + actor.VideoChannel.set('description', result.summary) + actor.VideoChannel.set('support', result.support) await actor.VideoChannel.save({ transaction: t }) } return actor }) } catch (err) { - logger.warn('Cannot refresh actor.', err) + logger.warn('Cannot refresh actor.', { err }) return actor } } - -function normalizeActor (actor: any) { - if (actor && actor.url && typeof actor.url === 'string') return actor - - actor.url = actor.url.href || actor.url.url - return actor -}