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

diff --git a/server/middlewares/activitypub.ts b/server/middlewares/activitypub.ts
index 37b7c42ec..d7f59be8c 100644
--- a/server/middlewares/activitypub.ts
+++ b/server/middlewares/activitypub.ts
@@ -1,7 +1,8 @@
 import { eachSeries } from 'async'
 import { NextFunction, Request, RequestHandler, Response } from 'express'
 import { ActivityPubSignature } from '../../shared'
-import { isSignatureVerified, logger } from '../helpers'
+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'
@@ -9,13 +10,15 @@ 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 actor %s...', signatureObject.creator)
+  const [ creator ] = signatureObject.creator.split('#')
+
+  logger.debug('Checking signature of actor %s...', creator)
 
   let actor: ActorModel
   try {
-    actor = await getOrCreateActorAndServerAndModel(signatureObject.creator)
+    actor = await getOrCreateActorAndServerAndModel(creator)
   } catch (err) {
-    logger.error('Cannot create remote actor and check signature.', err)
+    logger.warn('Cannot create remote actor %s and check signature.', creator, { err })
     return res.sendStatus(403)
   }