X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fvalidators%2Factivitypub%2Factivity.ts;h=e78ef07ef95a733fd9efaf41a6a7926a9c1305d3;hb=e7053b1d9d7f77d0375155b38d3e845f2163ecd8;hp=3f9057c0c395288ac838e03681524ee0281a9c0f;hpb=1d6e5dfc376f3c0c2120055cc093161e76419f98;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/validators/activitypub/activity.ts b/server/middlewares/validators/activitypub/activity.ts
index 3f9057c0c..e78ef07ef 100644
--- a/server/middlewares/validators/activitypub/activity.ts
+++ b/server/middlewares/validators/activitypub/activity.ts
@@ -1,22 +1,24 @@
 import * as express from 'express'
 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 { getServerActor } from '@server/models/application/application'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 
 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.status(HttpStatusCode.BAD_REQUEST_400)
+              .json({ error: 'Incorrect activity.' })
   }
 
   const serverActor = await getServerActor()
-  const remoteActor = res.locals.signature.actor as ActorModel
-  if (serverActor.id === remoteActor.id) {
+  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(409).end()
+    return res.status(HttpStatusCode.CONFLICT_409)
+              .end()
   }
 
   return next()