X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Factivitypub.ts;h=d7f59be8c5a2553ebd8fb76c1f4835d20facaf50;hb=6ca76832fde247a33cb2ee94208f492801d1791a;hp=29bec0c974d13a90d147ee849c3261e5c2f430b0;hpb=892211e8493b1f992fce7616cb1e48b7ff87a1dc;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/activitypub.ts b/server/middlewares/activitypub.ts
index 29bec0c97..d7f59be8c 100644
--- a/server/middlewares/activitypub.ts
+++ b/server/middlewares/activitypub.ts
@@ -1,36 +1,32 @@
 import { eachSeries } from 'async'
 import { NextFunction, Request, RequestHandler, Response } from 'express'
 import { ActivityPubSignature } from '../../shared'
-import { isSignatureVerified, logger } from '../helpers'
-import { database as db } from '../initializers'
-import { ACTIVITY_PUB } from '../initializers/constants'
-import { fetchRemoteAccountAndCreateServer } from '../lib/activitypub/account'
+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 fetchRemoteAccountAndCreateServer(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.warn('Cannot create remote actor %s and check signature.', creator, { 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()
@@ -38,10 +34,13 @@ async function checkSignature (req: Request, res: Response, next: NextFunction)
 
 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)