X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Factivitypub%2Factivity.ts;h=d24e4427b79cf5191ca4dd364fc72c004ed7e06a;hb=c4fa01f7c45b66b112ebd08abce744b7c4041feb;hp=15e8bb07968557053b1645e992468e73b4290c6d;hpb=285fe7c93072b2a8e6a9af6b7e8ffcdefcffbddf;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/validators/activitypub/activity.ts b/server/middlewares/validators/activitypub/activity.ts
index 15e8bb079..d24e4427b 100644
--- a/server/middlewares/validators/activitypub/activity.ts
+++ b/server/middlewares/validators/activitypub/activity.ts
@@ -1,29 +1,26 @@
 import * as express from 'express'
-import { body } from 'express-validator/check'
+import { getServerActor } from '@server/models/application/application'
+import { HttpStatusCode } from '../../../../shared/models/http/http-error-codes'
 import { isRootActivityValid } from '../../../helpers/custom-validators/activitypub/activity'
 import { logger } from '../../../helpers/logger'
-import { getServerActor } from '../../../helpers/utils'
-import { ActorModel } from '../../../models/activitypub/actor'
-import { areValidationErrors } from '../utils'
 
-const activityPubValidator = [
-  body('').custom((value, { req }) => isRootActivityValid(req.body)),
+async function activityPubValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
+  logger.debug('Checking activity pub parameters')
 
-  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking activity pub parameters')
-
-    if (areValidationErrors(req, res)) return
-
-    const serverActor = await getServerActor()
-    const remoteActor = res.locals.signature.actor as ActorModel
-    if (serverActor.id === remoteActor.id) {
-      logger.error('Receiving request in INBOX by ourselves!', req.body)
-      return res.sendStatus(409)
-    }
+  if (!isRootActivityValid(req.body)) {
+    logger.warn('Incorrect activity parameters.', { activity: req.body })
+    return res.fail({ message: 'Incorrect activity' })
+  }
 
-    return next()
+  const serverActor = await getServerActor()
+  const remoteActor = res.locals.signature.actor
+  if (serverActor.id === remoteActor.id || remoteActor.serverId === null) {
+    logger.error('Receiving request in INBOX by ourselves!', req.body)
+    return res.status(HttpStatusCode.CONFLICT_409).end()
   }
-]
+
+  return next()
+}
 
 // ---------------------------------------------------------------------------