X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Factor.ts;h=5773fc34fc9d5c6987b18dda58deebab139a198e;hb=5cf135001124cd19183336dbfcae1cd432217b00;hp=a39b4e137b008a013c1b945ee17b084cb63335d3;hpb=f05a1c30c15d2ae35c11e241ca039a72eeb7d6ad;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts index a39b4e137..5773fc34f 100644 --- a/server/lib/activitypub/actor.ts +++ b/server/lib/activitypub/actor.ts @@ -5,6 +5,7 @@ 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 { getActorUrl } from '../../helpers/activitypub' import { isActorObjectValid } from '../../helpers/custom-validators/activitypub/actor' import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' import { retryTransactionWrapper, updateInstanceWithAnother } from '../../helpers/database-utils' @@ -12,12 +13,13 @@ import { logger } from '../../helpers/logger' import { createPrivateAndPublicKeys } from '../../helpers/peertube-crypto' import { doRequest, doRequestAndSaveToFile } from '../../helpers/requests' import { getUrlFromWebfinger } from '../../helpers/webfinger' -import { AVATAR_MIMETYPE_EXT, CONFIG, sequelizeTypescript } from '../../initializers' +import { IMAGE_MIMETYPE_EXT, CONFIG, sequelizeTypescript, CONSTRAINTS_FIELDS } 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 { truncate } from 'lodash' // 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 +30,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 @@ -64,7 +68,11 @@ async function getOrCreateActorAndServerAndModel (actorUrl: string, recurseIfNee actor = await retryTransactionWrapper(saveActorAndServerAndModelIfNotExist, options) } - return refreshActorIfNeeded(actor) + const options = { + arguments: [ actor ], + errorMessage: 'Cannot refresh actor if needed with many retries.' + } + return retryTransactionWrapper(refreshActorIfNeeded, options) } function buildActorInstance (type: ActivityPubActorType, url: string, preferredUsername: string, uuid?: string) { @@ -109,7 +117,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 }) } } @@ -136,17 +144,17 @@ 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 } } async function fetchAvatarIfExists (actorJSON: ActivityPubActor) { if ( - actorJSON.icon && actorJSON.icon.type === 'Image' && AVATAR_MIMETYPE_EXT[actorJSON.icon.mediaType] !== undefined && + actorJSON.icon && actorJSON.icon.type === 'Image' && IMAGE_MIMETYPE_EXT[actorJSON.icon.mediaType] !== undefined && isActivityPubUrlValid(actorJSON.icon.url) ) { - const extension = AVATAR_MIMETYPE_EXT[actorJSON.icon.mediaType] + const extension = IMAGE_MIMETYPE_EXT[actorJSON.icon.mediaType] const avatarName = uuidv4() + extension const destPath = join(CONFIG.STORAGE.AVATARS_DIR, avatarName) @@ -162,6 +170,24 @@ async function fetchAvatarIfExists (actorJSON: ActivityPubActor) { return undefined } +function normalizeActor (actor: any) { + if (!actor) return + + if (!actor.url || typeof actor.url !== 'string') { + actor.url = actor.url.href || actor.url.url + } + + if (actor.summary && typeof actor.summary === 'string') { + actor.summary = truncate(actor.summary, { length: CONSTRAINTS_FIELDS.USERS.DESCRIPTION.max }) + + if (actor.summary.length < CONSTRAINTS_FIELDS.USERS.DESCRIPTION.min) { + actor.summary = null + } + } + + return +} + export { getOrCreateActorAndServerAndModel, buildActorInstance, @@ -169,7 +195,8 @@ export { fetchActorTotalItems, fetchAvatarIfExists, updateActorInstance, - updateActorAvatarInstance + updateActorAvatarInstance, + normalizeActor } // --------------------------------------------------------------------------- @@ -212,15 +239,19 @@ function saveActorAndServerAndModelIfNotExist ( // Force the actor creation, sometimes Sequelize skips the save() when it thinks the instance already exists // (which could be false in a retried query) - const actorCreated = await ActorModel.create(actor.toJSON(), { transaction: t }) + const [ actorCreated ] = await ActorModel.findOrCreate({ + defaults: actor.toJSON(), + where: { + url: actor.url + }, + transaction: t + }) 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 } @@ -232,6 +263,7 @@ type FetchRemoteActorResult = { actor: ActorModel name: string summary: string + support?: string avatarName?: string attributedTo: ActivityPubAttributedTo[] } @@ -246,6 +278,8 @@ async function fetchRemoteActor (actorUrl: string): Promise { if (!actor.isOutdated()) return actor - const actorUrl = await getUrlFromWebfinger(actor.preferredUsername, actor.getHost()) - const result = await fetchRemoteActor(actorUrl) - if (result === undefined) { - logger.warn('Cannot fetch remote actor in refresh actor.') - return actor - } - - return sequelizeTypescript.transaction(async t => { - updateInstanceWithAnother(actor, result.actor) - - if (result.avatarName !== undefined) { - await updateActorAvatarInstance(actor, result.avatarName, t) + try { + const actorUrl = await getUrlFromWebfinger(actor.preferredUsername, actor.getHost()) + const result = await fetchRemoteActor(actorUrl) + if (result === undefined) { + logger.warn('Cannot fetch remote actor in refresh actor.') + return actor } - // Force update - actor.setDataValue('updatedAt', new Date()) - await actor.save({ transaction: t }) + return sequelizeTypescript.transaction(async t => { + updateInstanceWithAnother(actor, result.actor) - if (actor.Account) { - await actor.save({ transaction: t }) + if (result.avatarName !== undefined) { + await updateActorAvatarInstance(actor, result.avatarName, t) + } - actor.Account.set('name', result.name) - await actor.Account.save({ transaction: t }) - } else if (actor.VideoChannel) { + // Force update + actor.setDataValue('updatedAt', new Date()) await actor.save({ transaction: t }) - actor.VideoChannel.set('name', result.name) - await actor.VideoChannel.save({ transaction: t }) - } + if (actor.Account) { + 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 }) return actor - }) + } }