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

diff --git a/server/middlewares/validators/activitypub/activity.ts b/server/middlewares/validators/activitypub/activity.ts
index 7582f65e7..d24e4427b 100644
--- a/server/middlewares/validators/activitypub/activity.ts
+++ b/server/middlewares/validators/activitypub/activity.ts
@@ -1,21 +1,22 @@
 import * as express from 'express'
+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'
 
 async function activityPubValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
   logger.debug('Checking activity pub parameters')
 
   if (!isRootActivityValid(req.body)) {
     logger.warn('Incorrect activity parameters.', { activity: req.body })
-    return res.status(400).json({ error: 'Incorrect activity.' })
+    return res.fail({ message: 'Incorrect activity' })
   }
 
   const serverActor = await getServerActor()
   const remoteActor = res.locals.signature.actor
-  if (serverActor.id === remoteActor.id) {
+  if (serverActor.id === remoteActor.id || remoteActor.serverId === null) {
     logger.error('Receiving request in INBOX by ourselves!', req.body)
-    return res.status(409).end()
+    return res.status(HttpStatusCode.CONFLICT_409).end()
   }
 
   return next()