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 { Op, Transaction } from 'sequelize'
+import { URL } from 'url'
+import { v4 as uuidv4 } from 'uuid'
+import { ActivityPubActor, ActivityPubActorType, ActivityPubOrderedCollection } from '../../../shared/models/activitypub'
import { ActivityPubAttributedTo } from '../../../shared/models/activitypub/objects'
import { checkUrlsSameHost, getAPId } from '../../helpers/activitypub'
import { sanitizeAndCheckActorObject } from '../../helpers/custom-validators/activitypub/actor'
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 {
MActorFull,
MActorFullActor,
MActorId,
- MChannel,
- MChannelAccountDefault
-} from '../../typings/models'
+ MChannel
+} from '../../types/models'
+import { extname } from 'path'
+import { getServerActor } from '@server/models/application/application'
// Set account keys, this could be long so process after the account creation and do not block the client
function setAsyncActorKeys <T extends MActor> (actor: T) {
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
actorInstance.followersUrl = attributes.followers
actorInstance.followingUrl = attributes.following
- if (attributes.endpoints && attributes.endpoints.sharedInbox) {
+ if (attributes.endpoints?.sharedInbox) {
actorInstance.sharedInboxUrl = attributes.endpoints.sharedInbox
}
}
}
try {
- const { body } = await doRequest(options)
+ const { body } = await doRequest<ActivityPubOrderedCollection<unknown>>(options)
return body.totalItems ? body.totalItems : 0
} catch (err) {
logger.warn('Cannot fetch remote actor count %s.', url, { err })
}
}
-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<ActorModel, 'id' | 'outboxUrl'>) {
if (statusCode === 404) {
logger.info('Deleting actor %s because there is a 404 in refresh actor.', actor.url)
- actor.Account ? actor.Account.destroy() : actor.VideoChannel.destroy()
+ actor.Account
+ ? await actor.Account.destroy()
+ : await actor.VideoChannel.destroy()
+
return { actor: undefined, refreshed: false }
}
ownerActor?: MActorFullActor,
t?: Transaction
): Bluebird<MActorFullActor> | Promise<MActorFullActor> {
- 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: {
// 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<MActorFullActor>({
+ const [ actorCreated, created ] = await ActorModel.findOrCreate<MActorFullActor>({
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
support?: string
playlists?: string
avatar?: {
- name: string,
+ name: string
fileUrl: string
}
attributedTo: ActivityPubAttributedTo[]
followersUrl: actorJSON.followers,
followingUrl: actorJSON.following,
- sharedInboxUrl: actorJSON.endpoints && actorJSON.endpoints.sharedInbox
+ sharedInboxUrl: actorJSON.endpoints?.sharedInbox
? actorJSON.endpoints.sharedInbox
: null
})
projects / github / Chocobozzz / PeerTube.git / blobdiff