X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Factor.ts;h=52b6c1f56d790f174e5e52ac77a1bfadd5ef4c8e;hb=2d5a469427641e5ace48ad487bae2f35d9759107;hp=74241aba9aed7058a2c94e14cb9a763b1419e8ca;hpb=a82ddfad0083bd886b97be945050559c53b0cf30;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts index 74241aba9..52b6c1f56 100644 --- a/server/lib/activitypub/actor.ts +++ b/server/lib/activitypub/actor.ts @@ -1,27 +1,28 @@ import * as Bluebird from 'bluebird' -import { Transaction } from 'sequelize' -import * as url from 'url' -import * as uuidv4 from 'uuid/v4' -import { ActivityPubActor, ActivityPubActorType } from '../../../shared/models/activitypub' +import { extname } from 'path' +import { Op, Transaction } from 'sequelize' +import { URL } from 'url' +import { v4 as uuidv4 } from 'uuid' +import { getServerActor } from '@server/models/application/application' +import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes' +import { ActivityPubActor, ActivityPubActorType, ActivityPubOrderedCollection } from '../../../shared/models/activitypub' import { ActivityPubAttributedTo } from '../../../shared/models/activitypub/objects' import { checkUrlsSameHost, getAPId } from '../../helpers/activitypub' +import { ActorFetchByUrlType, fetchActorByUrl } from '../../helpers/actor' import { sanitizeAndCheckActorObject } 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 } from '../../helpers/requests' +import { doJSONRequest } from '../../helpers/requests' import { getUrlFromWebfinger } from '../../helpers/webfinger' import { MIMETYPES, WEBSERVER } from '../../initializers/constants' +import { sequelizeTypescript } from '../../initializers/database' 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' -import { ActorFetchByUrlType, fetchActorByUrl } from '../../helpers/actor' -import { sequelizeTypescript } from '../../initializers/database' import { MAccount, MAccountDefault, @@ -33,22 +34,18 @@ import { MActorFull, MActorFullActor, MActorId, - MChannel, - MChannelAccountDefault -} from '../../typings/models' + MChannel +} from '../../types/models' +import { JobQueue } from '../job-queue' // Set account keys, this could be long so process after the account creation and do not block the client -function setAsyncActorKeys (actor: T) { - return createPrivateAndPublicKeys() - .then(({ publicKey, privateKey }) => { - actor.publicKey = publicKey - actor.privateKey = privateKey - return actor.save() - }) - .catch(err => { - logger.error('Cannot set public/private keys of actor %d.', actor.url, { err }) - return actor - }) +async function generateAndSaveActorKeys (actor: T) { + const { publicKey, privateKey } = await createPrivateAndPublicKeys() + + actor.publicKey = publicKey + actor.privateKey = privateKey + + return actor.save() } function getOrCreateActorAndServerAndModel ( @@ -103,7 +100,7 @@ async function getOrCreateActorAndServerAndModel ( const recurseIfNeeded = false ownerActor = await getOrCreateActorAndServerAndModel(accountAttributedTo.id, 'all', recurseIfNeeded) } catch (err) { - logger.error('Cannot get or create account attributed to video channel ' + actor.url) + logger.error('Cannot get or create account attributed to video channel ' + actorUrl) throw new Error(err) } } @@ -117,17 +114,17 @@ async function getOrCreateActorAndServerAndModel ( if (actor.VideoChannel) (actor as MActorAccountChannelIdActor).VideoChannel.Actor = actor const { actor: actorRefreshed, refreshed } = await retryTransactionWrapper(refreshActorIfNeeded, actor, fetchType) - if (!actorRefreshed) throw new Error('Actor ' + actorRefreshed.url + ' does not exist anymore.') + if (!actorRefreshed) throw new Error('Actor ' + actor.url + ' does not exist anymore.') if ((created === true || refreshed === true) && updateCollections === true) { const payload = { uri: actor.outboxUrl, type: 'activity' as 'activity' } - await JobQueue.Instance.createJob({ type: 'activitypub-http-fetcher', payload }) + await JobQueue.Instance.createJobWithPromise({ type: 'activitypub-http-fetcher', payload }) } // We created a new account: fetch the playlists if (created === true && actor.Account && accountPlaylistsUrl) { const payload = { uri: accountPlaylistsUrl, accountId: actor.Account.id, type: 'account-playlists' as 'account-playlists' } - await JobQueue.Instance.createJob({ type: 'activitypub-http-fetcher', payload }) + await JobQueue.Instance.createJobWithPromise({ type: 'activitypub-http-fetcher', payload }) } return actorRefreshed @@ -166,66 +163,84 @@ async function updateActorInstance (actorInstance: ActorModel, attributes: Activ actorInstance.followersUrl = attributes.followers actorInstance.followingUrl = attributes.following - if (attributes.endpoints && attributes.endpoints.sharedInbox) { + if (attributes.endpoints?.sharedInbox) { actorInstance.sharedInboxUrl = attributes.endpoints.sharedInbox } } type AvatarInfo = { name: string, onDisk: boolean, fileUrl: string } async function updateActorAvatarInstance (actor: MActorDefault, info: AvatarInfo, t: Transaction) { - if (info.name !== undefined) { - if (actor.avatarId) { - try { - await actor.Avatar.destroy({ transaction: t }) - } catch (err) { - logger.error('Cannot remove old avatar of actor %s.', actor.url, { err }) - } - } + if (!info.name) return actor - const avatar = await AvatarModel.create({ - filename: info.name, - onDisk: info.onDisk, - fileUrl: info.fileUrl - }, { transaction: t }) + if (actor.Avatar) { + // Don't update the avatar if the file URL did not change + if (info.fileUrl && actor.Avatar.fileUrl === info.fileUrl) return actor - actor.avatarId = avatar.id - actor.Avatar = avatar + try { + await actor.Avatar.destroy({ transaction: t }) + } catch (err) { + logger.error('Cannot remove old avatar of actor %s.', actor.url, { err }) + } } + const avatar = await AvatarModel.create({ + filename: info.name, + onDisk: info.onDisk, + fileUrl: info.fileUrl + }, { transaction: t }) + + actor.avatarId = avatar.id + actor.Avatar = avatar + return actor } -async function fetchActorTotalItems (url: string) { - const options = { - uri: url, - method: 'GET', - json: true, - activityPub: true +async function deleteActorAvatarInstance (actor: MActorDefault, t: Transaction) { + try { + await actor.Avatar.destroy({ transaction: t }) + } catch (err) { + logger.error('Cannot remove old avatar of actor %s.', actor.url, { err }) } + actor.avatarId = null + actor.Avatar = null + + return actor +} + +async function fetchActorTotalItems (url: string) { try { - const { body } = await doRequest(options) - return body.totalItems ? body.totalItems : 0 + const { body } = await doJSONRequest>(url, { activityPub: true }) + + return body.totalItems || 0 } catch (err) { logger.warn('Cannot fetch remote actor count %s.', url, { err }) return 0 } } -async function getAvatarInfoIfExists (actorJSON: ActivityPubActor) { - if ( - actorJSON.icon && actorJSON.icon.type === 'Image' && MIMETYPES.IMAGE.MIMETYPE_EXT[actorJSON.icon.mediaType] !== undefined && - isActivityPubUrlValid(actorJSON.icon.url) - ) { - const extension = MIMETYPES.IMAGE.MIMETYPE_EXT[actorJSON.icon.mediaType] +function getAvatarInfoIfExists (actorJSON: ActivityPubActor) { + const mimetypes = MIMETYPES.IMAGE + const icon = actorJSON.icon - return { - name: uuidv4() + extension, - fileUrl: actorJSON.icon.url - } + if (!icon || icon.type !== 'Image' || !isActivityPubUrlValid(icon.url)) return undefined + + let extension: string + + if (icon.mediaType) { + extension = mimetypes.MIMETYPE_EXT[icon.mediaType] + } else { + const tmp = extname(icon.url) + + if (mimetypes.EXT_MIMETYPE[tmp] !== undefined) extension = tmp } - return undefined + if (!extension) return undefined + + return { + name: uuidv4() + extension, + fileUrl: icon.url + } } async function addFetchOutboxJob (actor: Pick) { @@ -266,9 +281,12 @@ async function refreshActorIfNeeded | Promise { - let actor = result.actor + const actor = result.actor if (t !== undefined) return save(t) return sequelizeTypescript.transaction(t => save(t)) async function save (t: Transaction) { - const actorHost = url.parse(actor.url).host + const actorHost = new URL(actor.url).host const serverOptions = { where: { @@ -370,14 +389,33 @@ 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.findOrCreate({ + const [ actorCreated, created ] = await ActorModel.findOrCreate({ defaults: actor.toJSON(), where: { - url: actor.url + [Op.or]: [ + { + url: actor.url + }, + { + serverId: actor.serverId, + preferredUsername: actor.preferredUsername + } + ] }, transaction: t }) + // Try to fix non HTTPS accounts of remote instances that fixed their URL afterwards + if (created !== true && actorCreated.url !== actor.url) { + // Only fix http://example.com/account/djidane to https://example.com/account/djidane + if (actorCreated.url.replace(/^http:\/\//, '') !== actor.url.replace(/^https:\/\//, '')) { + throw new Error(`Actor from DB with URL ${actorCreated.url} does not correspond to actor ${actor.url}`) + } + + actorCreated.url = actor.url + await actorCreated.save({ transaction: t }) + } + if (actorCreated.type === 'Person' || actorCreated.type === 'Application') { actorCreated.Account = await saveAccount(actorCreated, result, t) as MAccountDefault actorCreated.Account.Actor = actorCreated @@ -399,32 +437,25 @@ type FetchRemoteActorResult = { support?: string playlists?: string avatar?: { - name: string, + name: string fileUrl: string } attributedTo: ActivityPubAttributedTo[] } async function fetchRemoteActor (actorUrl: string): Promise<{ statusCode?: number, result: FetchRemoteActorResult }> { - const options = { - uri: actorUrl, - method: 'GET', - json: true, - activityPub: true - } - logger.info('Fetching remote actor %s.', actorUrl) - const requestResult = await doRequest(options) + const requestResult = await doJSONRequest(actorUrl, { activityPub: true }) const actorJSON = requestResult.body if (sanitizeAndCheckActorObject(actorJSON) === false) { logger.debug('Remote actor JSON is not valid.', { actorJSON }) - return { result: undefined, statusCode: requestResult.response.statusCode } + return { result: undefined, statusCode: requestResult.statusCode } } if (checkUrlsSameHost(actorJSON.id, actorUrl) !== true) { logger.warn('Actor url %s has not the same host than its AP id %s', actorUrl, actorJSON.id) - return { result: undefined, statusCode: requestResult.response.statusCode } + return { result: undefined, statusCode: requestResult.statusCode } } const followersCount = await fetchActorTotalItems(actorJSON.followers) @@ -443,7 +474,7 @@ async function fetchRemoteActor (actorUrl: string): Promise<{ statusCode?: numbe followersUrl: actorJSON.followers, followingUrl: actorJSON.following, - sharedInboxUrl: actorJSON.endpoints && actorJSON.endpoints.sharedInbox + sharedInboxUrl: actorJSON.endpoints?.sharedInbox ? actorJSON.endpoints.sharedInbox : null }) @@ -452,7 +483,7 @@ async function fetchRemoteActor (actorUrl: string): Promise<{ statusCode?: numbe const name = actorJSON.name || actorJSON.preferredUsername return { - statusCode: requestResult.response.statusCode, + statusCode: requestResult.statusCode, result: { actor, name,