-import { NextFunction, Request, Response, RequestHandler } from 'express'
+import { eachSeries } from 'async'
+import { NextFunction, Request, RequestHandler, Response } from 'express'
import { ActivityPubSignature } from '../../shared'
-import { isSignatureVerified, logger } from '../helpers'
-import { fetchRemoteAccountAndCreatePod } from '../helpers/activitypub'
-import { database as db, ACTIVITY_PUB_ACCEPT_HEADER } from '../initializers'
-import { each, eachSeries, waterfall } from 'async'
+import { logger } from '../helpers/logger'
+import { isSignatureVerified } from '../helpers/peertube-crypto'
+import { ACCEPT_HEADERS, ACTIVITY_PUB } from '../initializers'
+import { getOrCreateActorAndServerAndModel } from '../lib/activitypub'
+import { ActorModel } from '../models/activitypub/actor'
async function checkSignature (req: Request, res: Response, next: NextFunction) {
const signatureObject: ActivityPubSignature = req.body.signature
- logger.debug('Checking signature of account %s...', signatureObject.creator)
+ const [ creator ] = signatureObject.creator.split('#')
- let account = await db.Account.loadByUrl(signatureObject.creator)
+ logger.debug('Checking signature of actor %s...', creator)
- // We don't have this account in our database, fetch it on remote
- if (!account) {
- const accountResult = await fetchRemoteAccountAndCreatePod(signatureObject.creator)
-
- if (!accountResult) {
- return res.sendStatus(403)
- }
-
- // Save our new account in database
- account = accountResult.account
- await account.save()
+ let actor: ActorModel
+ try {
+ actor = await getOrCreateActorAndServerAndModel(creator)
+ } catch (err) {
+ logger.error('Cannot create remote actor and check signature.', { err })
+ return res.sendStatus(403)
}
- const verified = await isSignatureVerified(account, req.body)
+ const verified = await isSignatureVerified(actor, req.body)
if (verified === false) return res.sendStatus(403)
res.locals.signature = {
- account
+ actor
}
return next()
function executeIfActivityPub (fun: RequestHandler | RequestHandler[]) {
return (req: Request, res: Response, next: NextFunction) => {
- if (req.header('Accept') !== ACTIVITY_PUB_ACCEPT_HEADER) {
+ const accepted = req.accepts(ACCEPT_HEADERS)
+ if (accepted === false || ACTIVITY_PUB.POTENTIAL_ACCEPT_HEADERS.indexOf(accepted) === -1) {
return next()
}
+ logger.debug('ActivityPub request for %s.', req.url)
+
if (Array.isArray(fun) === true) {
return eachSeries(fun as RequestHandler[], (f, cb) => {
f(req, res, cb)