X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Factivitypub.ts;h=6cd23f230016df1cc263a4fcb00cdd2a7ec06312;hb=e030bfb59dd5ee65f20a64686ec9b22ca39f70ae;hp=bd3bdb07635df8b2d950e2bfa61a31d3fdad63b4;hpb=e92269053e3fd0e9b9c155ded86a1668444f3d70;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/activitypub.ts b/server/middlewares/activitypub.ts
index bd3bdb076..6cd23f230 100644
--- a/server/middlewares/activitypub.ts
+++ b/server/middlewares/activitypub.ts
@@ -1,10 +1,13 @@
 import { NextFunction, Request, Response } from 'express'
-import { ActivityPubSignature } from '../../shared'
+import { ActivityDelete, ActivityPubSignature } from '../../shared'
 import { logger } from '../helpers/logger'
 import { isHTTPSignatureVerified, isJsonLDSignatureVerified, parseHTTPSignature } from '../helpers/peertube-crypto'
 import { ACCEPT_HEADERS, ACTIVITY_PUB, HTTP_SIGNATURE } from '../initializers/constants'
-import { getOrCreateActorAndServerAndModel } from '../lib/activitypub'
+import { getOrCreateActorAndServerAndModel } from '../lib/activitypub/actor'
 import { loadActorUrlOrGetFromWebfinger } from '../helpers/webfinger'
+import { isActorDeleteActivityValid } from '@server/helpers/custom-validators/activitypub/actor'
+import { getAPId } from '@server/helpers/activitypub'
+import { HttpStatusCode } from '../../shared/core-utils/miscs/http-error-codes'
 
 async function checkSignature (req: Request, res: Response, next: NextFunction) {
   try {
@@ -15,7 +18,7 @@ async function checkSignature (req: Request, res: Response, next: NextFunction)
 
     // Forwarded activity
     const bodyActor = req.body.actor
-    const bodyActorId = bodyActor && bodyActor.id ? bodyActor.id : bodyActor
+    const bodyActorId = getAPId(bodyActor)
     if (bodyActorId && bodyActorId !== actor.url) {
       const jsonLDSignatureChecked = await checkJsonLDSignature(req, res)
       if (jsonLDSignatureChecked !== true) return
@@ -23,14 +26,23 @@ async function checkSignature (req: Request, res: Response, next: NextFunction)
 
     return next()
   } catch (err) {
-    logger.error('Error in ActivityPub signature checker.', err)
-    return res.sendStatus(403)
+    const activity: ActivityDelete = req.body
+    if (isActorDeleteActivityValid(activity) && activity.object === activity.actor) {
+      logger.debug('Handling signature error on actor delete activity', { err })
+      return res.status(HttpStatusCode.NO_CONTENT_204).end()
+    }
+
+    logger.warn('Error in ActivityPub signature checker.', { err })
+    return res.fail({
+      status: HttpStatusCode.FORBIDDEN_403,
+      message: 'ActivityPub signature could not be checked'
+    })
   }
 }
 
 function executeIfActivityPub (req: Request, res: Response, next: NextFunction) {
   const accepted = req.accepts(ACCEPT_HEADERS)
-  if (accepted === false || ACTIVITY_PUB.POTENTIAL_ACCEPT_HEADERS.indexOf(accepted) === -1) {
+  if (accepted === false || ACTIVITY_PUB.POTENTIAL_ACCEPT_HEADERS.includes(accepted) === false) {
     // Bypass this route
     return next('route')
   }
@@ -55,12 +67,29 @@ async function checkHttpSignature (req: Request, res: Response) {
   const sig = req.headers[HTTP_SIGNATURE.HEADER_NAME] as string
   if (sig && sig.startsWith('Signature ') === true) req.headers[HTTP_SIGNATURE.HEADER_NAME] = sig.replace(/^Signature /, '')
 
-  logger.info('coucou', { signature: req.headers[HTTP_SIGNATURE.HEADER_NAME] })
-  const parsed = parseHTTPSignature(req, HTTP_SIGNATURE.CLOCK_SKEW_SECONDS)
+  let parsed: any
+
+  try {
+    parsed = parseHTTPSignature(req, HTTP_SIGNATURE.CLOCK_SKEW_SECONDS)
+  } catch (err) {
+    logger.warn('Invalid signature because of exception in signature parser', { reqBody: req.body, err })
+
+    res.fail({
+      status: HttpStatusCode.FORBIDDEN_403,
+      message: err.message
+    })
+    return false
+  }
 
   const keyId = parsed.keyId
   if (!keyId) {
-    res.sendStatus(403)
+    res.fail({
+      status: HttpStatusCode.FORBIDDEN_403,
+      message: 'Invalid key ID',
+      data: {
+        keyId
+      }
+    })
     return false
   }
 
@@ -77,12 +106,17 @@ async function checkHttpSignature (req: Request, res: Response) {
   if (verified !== true) {
     logger.warn('Signature from %s is invalid', actorUrl, { parsed })
 
-    res.sendStatus(403)
+    res.fail({
+      status: HttpStatusCode.FORBIDDEN_403,
+      message: 'Invalid signature',
+      data: {
+        actorUrl
+      }
+    })
     return false
   }
 
   res.locals.signature = { actor }
-
   return true
 }
 
@@ -90,7 +124,10 @@ async function checkJsonLDSignature (req: Request, res: Response) {
   const signatureObject: ActivityPubSignature = req.body.signature
 
   if (!signatureObject || !signatureObject.creator) {
-    res.sendStatus(403)
+    res.fail({
+      status: HttpStatusCode.FORBIDDEN_403,
+      message: 'Object and creator signature do not match'
+    })
     return false
   }
 
@@ -104,11 +141,13 @@ async function checkJsonLDSignature (req: Request, res: Response) {
   if (verified !== true) {
     logger.warn('Signature not verified.', req.body)
 
-    res.sendStatus(403)
+    res.fail({
+      status: HttpStatusCode.FORBIDDEN_403,
+      message: 'Signature could not be verified'
+    })
     return false
   }
 
   res.locals.signature = { actor }
-
   return true
 }